From 178078282c4748df11ecdbf9fb261c0c905f9713 Mon Sep 17 00:00:00 2001 From: Darin Kelkhoff Date: Mon, 16 Jan 2023 10:11:54 -0600 Subject: [PATCH] Switch to use QLogger everywhere --- .../core/actions/async/AsyncJobManager.java | 5 +- .../actions/async/AsyncRecordPipeLoop.java | 5 +- .../PollingAutomationPerTableRunner.java | 5 +- .../core/actions/customizers/QCodeLoader.java | 5 +- ...lkTableActionProcessPermissionChecker.java | 5 +- .../permissions/PermissionsHelper.java | 5 +- .../processes/RunBackendStepAction.java | 5 +- .../actions/processes/RunProcessAction.java | 5 +- .../core/actions/queues/SQSQueuePoller.java | 5 +- .../actions/reporting/CsvExportStreamer.java | 5 +- .../reporting/ExcelExportStreamer.java | 5 +- .../core/actions/reporting/ExportAction.java | 5 +- .../reporting/GenerateReportAction.java | 5 +- .../actions/reporting/JsonExportStreamer.java | 7 +- .../reporting/ListOfMapsExportStreamer.java | 5 +- .../core/actions/reporting/RecordPipe.java | 5 +- ...iptLogAndScriptLogLineExecutionLogger.java | 5 +- .../logging/Log4jCodeExecutionLogger.java | 5 +- ...iptLogAndScriptLogLineExecutionLogger.java | 5 +- .../core/actions/tables/DeleteAction.java | 5 +- .../core/actions/tables/InsertAction.java | 5 +- .../core/actions/tables/QueryAction.java | 5 +- .../values/QPossibleValueTranslator.java | 5 +- .../core/actions/values/QValueFormatter.java | 5 +- .../SearchPossibleValueSourceAction.java | 5 +- .../qqq/backend/core/context/QContext.java | 5 +- .../core/instances/QInstanceEnricher.java | 5 +- .../core/instances/QInstanceValidator.java | 5 +- .../QMetaDataVariableInterpreter.java | 5 +- .../model/actions/AbstractActionInput.java | 5 +- .../actions/tables/query/QFilterCriteria.java | 5 +- .../actions/tables/query/QQueryFilter.java | 5 +- .../tables/query/QueryOutputRecordPipe.java | 5 +- .../core/model/data/QRecordEntity.java | 5 +- .../backend/core/model/data/QRecordEnum.java | 5 +- .../serialization/DeserializerUtils.java | 5 +- .../Auth0AuthenticationModule.java | 5 +- .../MockAuthenticationModule.java | 8 +- .../TableBasedAuthenticationModule.java | 5 +- .../backend/QBackendModuleDispatcher.java | 5 +- .../implementations/mock/MockQueryAction.java | 5 +- .../etl/basic/BasicETLExtractFunction.java | 5 +- .../etl/basic/BasicETLLoadFunction.java | 5 +- .../etl/basic/BasicETLTransformFunction.java | 5 +- .../etl/streamed/StreamedETLBackendStep.java | 5 +- .../BaseStreamedETLStep.java | 5 +- .../StreamedETLExecuteStep.java | 5 +- .../StreamedETLPreviewStep.java | 5 +- .../StreamedETLValidateStep.java | 5 +- .../implementations/mock/MockBackendStep.java | 5 +- .../core/scheduler/ScheduleManager.java | 5 +- .../scheduler/StandardScheduledExecutor.java | 5 +- .../core/state/TempFileStateProvider.java | 5 +- .../qqq/backend/core/utils/JsonUtils.java | 4 +- .../qqq/backend/core/utils/QLogger.java | 171 ++++++++++++++++++ .../qqq/backend/core/utils/Timer.java | 4 +- .../kingsrook/qqq/backend/core/BaseTest.java | 5 +- ...ChildInserterPostInsertCustomizerTest.java | 1 - .../actions/processes/RunProcessTest.java | 5 +- .../qqq/backend/core/utils/LogUtilsTest.java | 4 +- .../qqq/backend/core/utils/TestUtils.java | 4 +- .../module/api/actions/APIInsertAction.java | 5 +- .../qqq/backend/module/api/BaseTest.java | 5 +- .../backend/module/api/EasyPostApiTest.java | 1 - .../qqq/backend/module/api/EasyPostUtils.java | 5 +- .../actions/AbstractBaseFilesystemAction.java | 5 +- .../local/FilesystemBackendModule.java | 6 +- .../actions/AbstractFilesystemAction.java | 5 +- .../basic/BasicETLCleanupSourceFilesStep.java | 5 +- .../filesystem/sync/FilesystemSyncStep.java | 9 +- .../s3/actions/AbstractS3Action.java | 5 +- .../module/filesystem/s3/utils/S3Utils.java | 9 +- .../backend/module/filesystem/BaseTest.java | 5 +- .../backend/module/filesystem/TestUtils.java | 2 +- .../actions/FilesystemInsertActionTest.java | 1 - .../s3/S3BackendModuleSubclassForTest.java | 2 +- .../s3/actions/AbstractS3ActionTest.java | 3 +- .../s3/actions/S3InsertActionTest.java | 1 - .../rdbms/actions/AbstractRDBMSAction.java | 5 +- .../rdbms/actions/RDBMSAggregateAction.java | 5 +- .../rdbms/actions/RDBMSCountAction.java | 5 +- .../rdbms/actions/RDBMSDeleteAction.java | 5 +- .../rdbms/actions/RDBMSInsertAction.java | 5 +- .../rdbms/actions/RDBMSQueryAction.java | 5 +- .../rdbms/actions/RDBMSTransaction.java | 5 +- .../qqq/backend/module/rdbms/BaseTest.java | 5 +- .../qqq/languages/javascript/BaseTest.java | 5 +- .../qqq/languages/javascript/TestUtils.java | 2 +- .../javalin/QJavalinImplementation.java | 5 +- .../javalin/QJavalinProcessHandler.java | 5 +- .../qqq/backend/javalin/TestUtils.java | 1 - .../qqq/lambda/QAbstractLambdaHandler.java | 7 +- .../qqq/frontend/picocli/TestUtils.java | 6 +- .../qqq/slack/QSlackImplementation.java | 5 +- .../sampleapp/SampleJavalinServer.java | 5 +- 95 files changed, 352 insertions(+), 271 deletions(-) diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/async/AsyncJobManager.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/async/AsyncJobManager.java index 23836371..398a4e0c 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/async/AsyncJobManager.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/async/AsyncJobManager.java @@ -37,8 +37,7 @@ import com.kingsrook.qqq.backend.core.state.InMemoryStateProvider; import com.kingsrook.qqq.backend.core.state.StateProviderInterface; import com.kingsrook.qqq.backend.core.state.StateType; import com.kingsrook.qqq.backend.core.state.UUIDAndTypeStateKey; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -46,7 +45,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class AsyncJobManager { - private static final Logger LOG = LogManager.getLogger(AsyncJobManager.class); + private static final QLogger LOG = QLogger.getLogger(AsyncJobManager.class); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/async/AsyncRecordPipeLoop.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/async/AsyncRecordPipeLoop.java index 0eddc2e3..aba09f0f 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/async/AsyncRecordPipeLoop.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/async/AsyncRecordPipeLoop.java @@ -27,9 +27,8 @@ import java.util.Optional; import java.util.concurrent.TimeUnit; import com.kingsrook.qqq.backend.core.actions.reporting.RecordPipe; import com.kingsrook.qqq.backend.core.exceptions.QException; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.core.utils.SleepUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -40,7 +39,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class AsyncRecordPipeLoop { - private static final Logger LOG = LogManager.getLogger(AsyncRecordPipeLoop.class); + private static final QLogger LOG = QLogger.getLogger(AsyncRecordPipeLoop.class); private static final int TIMEOUT_AFTER_NO_RECORDS_MS = 10 * 60 * 1000; diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/automation/polling/PollingAutomationPerTableRunner.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/automation/polling/PollingAutomationPerTableRunner.java index 4be624a1..18d7def6 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/automation/polling/PollingAutomationPerTableRunner.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/automation/polling/PollingAutomationPerTableRunner.java @@ -59,10 +59,9 @@ import com.kingsrook.qqq.backend.core.model.metadata.tables.automation.TriggerEv import com.kingsrook.qqq.backend.core.model.session.QSession; import com.kingsrook.qqq.backend.core.scheduler.StandardScheduledExecutor; import com.kingsrook.qqq.backend.core.utils.CollectionUtils; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.core.utils.StringUtils; import org.apache.commons.lang.NotImplementedException; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -76,7 +75,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class PollingAutomationPerTableRunner implements Runnable { - private static final Logger LOG = LogManager.getLogger(PollingAutomationPerTableRunner.class); + private static final QLogger LOG = QLogger.getLogger(PollingAutomationPerTableRunner.class); private final TableActions tableActions; private final String name; diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/customizers/QCodeLoader.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/customizers/QCodeLoader.java index 62c88535..dacbceee 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/customizers/QCodeLoader.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/customizers/QCodeLoader.java @@ -33,8 +33,7 @@ import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeType; import com.kingsrook.qqq.backend.core.model.metadata.possiblevalues.QPossibleValueSource; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; import com.kingsrook.qqq.backend.core.model.metadata.tables.automation.TableAutomationAction; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -42,7 +41,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class QCodeLoader { - private static final Logger LOG = LogManager.getLogger(QCodeLoader.class); + private static final QLogger LOG = QLogger.getLogger(QCodeLoader.class); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/permissions/BulkTableActionProcessPermissionChecker.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/permissions/BulkTableActionProcessPermissionChecker.java index 3a28ada0..b873ef89 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/permissions/BulkTableActionProcessPermissionChecker.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/permissions/BulkTableActionProcessPermissionChecker.java @@ -26,8 +26,7 @@ import com.kingsrook.qqq.backend.core.exceptions.QPermissionDeniedException; import com.kingsrook.qqq.backend.core.model.actions.AbstractActionInput; import com.kingsrook.qqq.backend.core.model.actions.AbstractTableActionInput; import com.kingsrook.qqq.backend.core.model.metadata.permissions.MetaDataWithPermissionRules; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -35,7 +34,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class BulkTableActionProcessPermissionChecker implements CustomPermissionChecker { - private static final Logger LOG = LogManager.getLogger(BulkTableActionProcessPermissionChecker.class); + private static final QLogger LOG = QLogger.getLogger(BulkTableActionProcessPermissionChecker.class); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/permissions/PermissionsHelper.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/permissions/PermissionsHelper.java index ee112b9f..1d0ea654 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/permissions/PermissionsHelper.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/permissions/PermissionsHelper.java @@ -43,9 +43,8 @@ import com.kingsrook.qqq.backend.core.model.metadata.processes.QProcessMetaData; import com.kingsrook.qqq.backend.core.model.metadata.reporting.QReportMetaData; 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.utils.QLogger; import com.kingsrook.qqq.backend.core.utils.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -53,7 +52,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class PermissionsHelper { - private static final Logger LOG = LogManager.getLogger(PermissionsHelper.class); + private static final QLogger LOG = QLogger.getLogger(PermissionsHelper.class); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/processes/RunBackendStepAction.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/processes/RunBackendStepAction.java index 38172b49..11d3be1e 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/processes/RunBackendStepAction.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/processes/RunBackendStepAction.java @@ -42,8 +42,7 @@ import com.kingsrook.qqq.backend.core.model.metadata.processes.QFunctionInputMet import com.kingsrook.qqq.backend.core.model.metadata.processes.QProcessMetaData; import com.kingsrook.qqq.backend.core.model.metadata.processes.QStepMetaData; import com.kingsrook.qqq.backend.core.utils.CollectionUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -52,7 +51,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class RunBackendStepAction { - private static final Logger LOG = LogManager.getLogger(RunBackendStepAction.class); + private static final QLogger LOG = QLogger.getLogger(RunBackendStepAction.class); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/processes/RunProcessAction.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/processes/RunProcessAction.java index 4899c3dc..98041f61 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/processes/RunProcessAction.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/processes/RunProcessAction.java @@ -58,10 +58,9 @@ import com.kingsrook.qqq.backend.core.state.StateProviderInterface; import com.kingsrook.qqq.backend.core.state.StateType; import com.kingsrook.qqq.backend.core.state.UUIDAndTypeStateKey; import com.kingsrook.qqq.backend.core.utils.CollectionUtils; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.core.utils.ValueUtils; import org.apache.commons.lang.BooleanUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -70,7 +69,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class RunProcessAction { - private static final Logger LOG = LogManager.getLogger(RunProcessAction.class); + private static final QLogger LOG = QLogger.getLogger(RunProcessAction.class); public static final String BASEPULL_THIS_RUNTIME_KEY = "basepullThisRuntimeKey"; public static final String BASEPULL_LAST_RUNTIME_KEY = "basepullLastRuntimeKey"; diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/queues/SQSQueuePoller.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/queues/SQSQueuePoller.java index f56f911c..76ff0bc1 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/queues/SQSQueuePoller.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/queues/SQSQueuePoller.java @@ -43,8 +43,7 @@ import com.kingsrook.qqq.backend.core.model.metadata.queues.QQueueMetaData; import com.kingsrook.qqq.backend.core.model.metadata.queues.SQSQueueProviderMetaData; import com.kingsrook.qqq.backend.core.model.session.QSession; import com.kingsrook.qqq.backend.core.scheduler.StandardScheduledExecutor; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -52,7 +51,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class SQSQueuePoller implements Runnable { - private static final Logger LOG = LogManager.getLogger(SQSQueuePoller.class); + private static final QLogger LOG = QLogger.getLogger(SQSQueuePoller.class); /////////////////////////////////////////////// // todo - move these 2 to a "QBaseRunnable"? // diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/CsvExportStreamer.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/CsvExportStreamer.java index 4b8a9a46..4c1140ca 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/CsvExportStreamer.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/CsvExportStreamer.java @@ -31,9 +31,8 @@ import com.kingsrook.qqq.backend.core.model.actions.reporting.ExportInput; import com.kingsrook.qqq.backend.core.model.data.QRecord; import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.core.utils.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -41,7 +40,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class CsvExportStreamer implements ExportStreamerInterface { - private static final Logger LOG = LogManager.getLogger(CsvExportStreamer.class); + private static final QLogger LOG = QLogger.getLogger(CsvExportStreamer.class); private final QRecordToCsvAdapter qRecordToCsvAdapter; diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/ExcelExportStreamer.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/ExcelExportStreamer.java index 6520f6b8..8710cba6 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/ExcelExportStreamer.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/ExcelExportStreamer.java @@ -43,10 +43,9 @@ import com.kingsrook.qqq.backend.core.model.metadata.QInstance; import com.kingsrook.qqq.backend.core.model.metadata.fields.DisplayFormat; import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.core.utils.StringUtils; import com.kingsrook.qqq.backend.core.utils.ValueUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.dhatim.fastexcel.StyleSetter; import org.dhatim.fastexcel.Workbook; import org.dhatim.fastexcel.Worksheet; @@ -57,7 +56,7 @@ import org.dhatim.fastexcel.Worksheet; *******************************************************************************/ public class ExcelExportStreamer implements ExportStreamerInterface { - private static final Logger LOG = LogManager.getLogger(ExcelExportStreamer.class); + private static final QLogger LOG = QLogger.getLogger(ExcelExportStreamer.class); private ExportInput exportInput; private QTableMetaData table; diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/ExportAction.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/ExportAction.java index 3ecd354c..263cf9de 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/ExportAction.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/ExportAction.java @@ -48,10 +48,9 @@ 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.utils.CollectionUtils; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.core.utils.SleepUtils; import com.kingsrook.qqq.backend.core.utils.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -67,7 +66,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class ExportAction { - private static final Logger LOG = LogManager.getLogger(ExportAction.class); + private static final QLogger LOG = QLogger.getLogger(ExportAction.class); private boolean preExecuteRan = false; private Integer countFromPreExecute = null; diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/GenerateReportAction.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/GenerateReportAction.java index 835f8f70..3f845dc9 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/GenerateReportAction.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/GenerateReportAction.java @@ -67,13 +67,12 @@ import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; import com.kingsrook.qqq.backend.core.processes.implementations.etl.streamedwithfrontend.AbstractTransformStep; import com.kingsrook.qqq.backend.core.utils.CollectionUtils; import com.kingsrook.qqq.backend.core.utils.Pair; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.core.utils.StringUtils; import com.kingsrook.qqq.backend.core.utils.ValueUtils; import com.kingsrook.qqq.backend.core.utils.aggregates.AggregatesInterface; import com.kingsrook.qqq.backend.core.utils.aggregates.BigDecimalAggregates; import com.kingsrook.qqq.backend.core.utils.aggregates.IntegerAggregates; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -90,7 +89,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class GenerateReportAction { - private static final Logger LOG = LogManager.getLogger(GenerateReportAction.class); + private static final QLogger LOG = QLogger.getLogger(GenerateReportAction.class); ///////////////////////////////////////////////////////////////////////////////////////////////////////////// // summaryAggregates and varianceAggregates are multi-level maps, ala: // diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/JsonExportStreamer.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/JsonExportStreamer.java index 90d76f2d..cc0ceab2 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/JsonExportStreamer.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/JsonExportStreamer.java @@ -35,9 +35,8 @@ import com.kingsrook.qqq.backend.core.model.data.QRecord; import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; import com.kingsrook.qqq.backend.core.utils.JsonUtils; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.core.utils.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -45,14 +44,14 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class JsonExportStreamer implements ExportStreamerInterface { - private static final Logger LOG = LogManager.getLogger(JsonExportStreamer.class); + private static final QLogger LOG = QLogger.getLogger(JsonExportStreamer.class); private ExportInput exportInput; private QTableMetaData table; private List fields; private OutputStream outputStream; - private boolean needComma = false; + private boolean needComma = false; private boolean prettyPrint = true; diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/ListOfMapsExportStreamer.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/ListOfMapsExportStreamer.java index e1fe89b6..85107e49 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/ListOfMapsExportStreamer.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/ListOfMapsExportStreamer.java @@ -30,8 +30,7 @@ import com.kingsrook.qqq.backend.core.exceptions.QReportingException; import com.kingsrook.qqq.backend.core.model.actions.reporting.ExportInput; import com.kingsrook.qqq.backend.core.model.data.QRecord; import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -41,7 +40,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class ListOfMapsExportStreamer implements ExportStreamerInterface { - private static final Logger LOG = LogManager.getLogger(ListOfMapsExportStreamer.class); + private static final QLogger LOG = QLogger.getLogger(ListOfMapsExportStreamer.class); private ExportInput exportInput; private List fields; diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/RecordPipe.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/RecordPipe.java index 39e9fa69..5bc7eebf 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/RecordPipe.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/RecordPipe.java @@ -28,9 +28,8 @@ import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.TimeUnit; import java.util.function.Consumer; import com.kingsrook.qqq.backend.core.model.data.QRecord; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.core.utils.SleepUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -39,7 +38,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class RecordPipe { - private static final Logger LOG = LogManager.getLogger(RecordPipe.class); + private static final QLogger LOG = QLogger.getLogger(RecordPipe.class); private static final long BLOCKING_SLEEP_MILLIS = 100; private static final long MAX_SLEEP_LOOP_MILLIS = 300_000; // 5 minutes diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/scripts/logging/BuildScriptLogAndScriptLogLineExecutionLogger.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/scripts/logging/BuildScriptLogAndScriptLogLineExecutionLogger.java index 7dc4b45e..be98d710 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/scripts/logging/BuildScriptLogAndScriptLogLineExecutionLogger.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/scripts/logging/BuildScriptLogAndScriptLogLineExecutionLogger.java @@ -29,10 +29,9 @@ import java.util.ArrayList; import java.util.List; import com.kingsrook.qqq.backend.core.model.actions.scripts.ExecuteCodeInput; import com.kingsrook.qqq.backend.core.model.data.QRecord; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.core.utils.StringUtils; import com.kingsrook.qqq.backend.core.utils.ValueUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -42,7 +41,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class BuildScriptLogAndScriptLogLineExecutionLogger implements QCodeExecutionLoggerInterface { - private static final Logger LOG = LogManager.getLogger(BuildScriptLogAndScriptLogLineExecutionLogger.class); + private static final QLogger LOG = QLogger.getLogger(BuildScriptLogAndScriptLogLineExecutionLogger.class); private QRecord scriptLog; private List scriptLogLines = new ArrayList<>(); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/scripts/logging/Log4jCodeExecutionLogger.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/scripts/logging/Log4jCodeExecutionLogger.java index 498652ef..411ac9c0 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/scripts/logging/Log4jCodeExecutionLogger.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/scripts/logging/Log4jCodeExecutionLogger.java @@ -26,10 +26,9 @@ import java.io.Serializable; import java.util.UUID; import com.kingsrook.qqq.backend.core.model.actions.scripts.ExecuteCodeInput; import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeReference; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.core.utils.StringUtils; import com.kingsrook.qqq.backend.core.utils.ValueUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -37,7 +36,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class Log4jCodeExecutionLogger implements QCodeExecutionLoggerInterface { - private static final Logger LOG = LogManager.getLogger(Log4jCodeExecutionLogger.class); + private static final QLogger LOG = QLogger.getLogger(Log4jCodeExecutionLogger.class); private QCodeReference qCodeReference; private String uuid = UUID.randomUUID().toString(); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/scripts/logging/StoreScriptLogAndScriptLogLineExecutionLogger.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/scripts/logging/StoreScriptLogAndScriptLogLineExecutionLogger.java index c9534d2c..acd8094a 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/scripts/logging/StoreScriptLogAndScriptLogLineExecutionLogger.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/scripts/logging/StoreScriptLogAndScriptLogLineExecutionLogger.java @@ -31,8 +31,7 @@ import com.kingsrook.qqq.backend.core.model.actions.tables.insert.InsertInput; import com.kingsrook.qqq.backend.core.model.actions.tables.insert.InsertOutput; import com.kingsrook.qqq.backend.core.model.actions.tables.update.UpdateInput; import com.kingsrook.qqq.backend.core.utils.CollectionUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -41,7 +40,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class StoreScriptLogAndScriptLogLineExecutionLogger extends BuildScriptLogAndScriptLogLineExecutionLogger { - private static final Logger LOG = LogManager.getLogger(StoreScriptLogAndScriptLogLineExecutionLogger.class); + private static final QLogger LOG = QLogger.getLogger(StoreScriptLogAndScriptLogLineExecutionLogger.class); 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 166ffaab..90cb6e6a 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 @@ -35,8 +35,7 @@ import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryOutput; import com.kingsrook.qqq.backend.core.modules.backend.QBackendModuleDispatcher; import com.kingsrook.qqq.backend.core.modules.backend.QBackendModuleInterface; import com.kingsrook.qqq.backend.core.utils.CollectionUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -45,7 +44,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class DeleteAction { - private static final Logger LOG = LogManager.getLogger(DeleteAction.class); + private static final QLogger LOG = QLogger.getLogger(DeleteAction.class); 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 e92481bb..c43c082d 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 @@ -48,8 +48,7 @@ import com.kingsrook.qqq.backend.core.model.metadata.tables.UniqueKey; import com.kingsrook.qqq.backend.core.modules.backend.QBackendModuleDispatcher; import com.kingsrook.qqq.backend.core.modules.backend.QBackendModuleInterface; import com.kingsrook.qqq.backend.core.utils.CollectionUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -58,7 +57,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class InsertAction extends AbstractQActionFunction { - private static final Logger LOG = LogManager.getLogger(InsertAction.class); + private static final QLogger LOG = QLogger.getLogger(InsertAction.class); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/QueryAction.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/QueryAction.java index 561acf80..098a5142 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/QueryAction.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/QueryAction.java @@ -37,8 +37,7 @@ 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.modules.backend.QBackendModuleDispatcher; import com.kingsrook.qqq.backend.core.modules.backend.QBackendModuleInterface; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -47,7 +46,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class QueryAction { - private static final Logger LOG = LogManager.getLogger(QueryAction.class); + private static final QLogger LOG = QLogger.getLogger(QueryAction.class); private Optional postQueryRecordCustomizer; diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/values/QPossibleValueTranslator.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/values/QPossibleValueTranslator.java index ef4f63f8..2d5fa6cf 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/values/QPossibleValueTranslator.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/values/QPossibleValueTranslator.java @@ -53,10 +53,9 @@ import com.kingsrook.qqq.backend.core.model.session.QSession; import com.kingsrook.qqq.backend.core.utils.CollectionUtils; import com.kingsrook.qqq.backend.core.utils.ListingHash; import com.kingsrook.qqq.backend.core.utils.Pair; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.core.utils.StringUtils; import com.kingsrook.qqq.backend.core.utils.ValueUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -65,7 +64,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class QPossibleValueTranslator { - private static final Logger LOG = LogManager.getLogger(QPossibleValueTranslator.class); + private static final QLogger LOG = QLogger.getLogger(QPossibleValueTranslator.class); private final QInstance qInstance; private final QSession session; diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/values/QValueFormatter.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/values/QValueFormatter.java index cf43ab44..27057dc7 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/values/QValueFormatter.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/values/QValueFormatter.java @@ -33,10 +33,9 @@ import com.kingsrook.qqq.backend.core.model.data.QRecord; 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.tables.QTableMetaData; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.core.utils.StringUtils; import com.kingsrook.qqq.backend.core.utils.ValueUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -45,7 +44,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class QValueFormatter { - private static final Logger LOG = LogManager.getLogger(QValueFormatter.class); + private static final QLogger LOG = QLogger.getLogger(QValueFormatter.class); private static DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd h:mm a"); private static DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/values/SearchPossibleValueSourceAction.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/values/SearchPossibleValueSourceAction.java index a0ba2249..e7b6da7b 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/values/SearchPossibleValueSourceAction.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/values/SearchPossibleValueSourceAction.java @@ -42,11 +42,10 @@ import com.kingsrook.qqq.backend.core.model.metadata.possiblevalues.QPossibleVal import com.kingsrook.qqq.backend.core.model.metadata.possiblevalues.QPossibleValueSource; import com.kingsrook.qqq.backend.core.model.metadata.possiblevalues.QPossibleValueSourceType; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.core.utils.StringUtils; import com.kingsrook.qqq.backend.core.utils.ValueUtils; import org.apache.commons.lang.NotImplementedException; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -55,7 +54,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class SearchPossibleValueSourceAction { - private static final Logger LOG = LogManager.getLogger(SearchPossibleValueSourceAction.class); + private static final QLogger LOG = QLogger.getLogger(SearchPossibleValueSourceAction.class); private QPossibleValueTranslator possibleValueTranslator; diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/context/QContext.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/context/QContext.java index 3d666c07..461d1042 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/context/QContext.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/context/QContext.java @@ -29,8 +29,7 @@ import com.kingsrook.qqq.backend.core.instances.QInstanceValidator; import com.kingsrook.qqq.backend.core.model.actions.AbstractActionInput; import com.kingsrook.qqq.backend.core.model.metadata.QInstance; import com.kingsrook.qqq.backend.core.model.session.QSession; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -40,7 +39,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class QContext { - private static final Logger LOG = LogManager.getLogger(QContext.class); + private static final QLogger LOG = QLogger.getLogger(QContext.class); private static ThreadLocal qInstanceThreadLocal = new ThreadLocal<>(); private static ThreadLocal qSessionThreadLocal = new ThreadLocal<>(); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/instances/QInstanceEnricher.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/instances/QInstanceEnricher.java index 54e193b8..b1470a67 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/instances/QInstanceEnricher.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/instances/QInstanceEnricher.java @@ -71,9 +71,8 @@ import com.kingsrook.qqq.backend.core.processes.implementations.etl.streamedwith import com.kingsrook.qqq.backend.core.processes.implementations.etl.streamedwithfrontend.LoadViaUpdateStep; import com.kingsrook.qqq.backend.core.processes.implementations.etl.streamedwithfrontend.StreamedETLWithFrontendProcess; import com.kingsrook.qqq.backend.core.utils.CollectionUtils; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.core.utils.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -83,7 +82,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class QInstanceEnricher { - private static final Logger LOG = LogManager.getLogger(QInstanceEnricher.class); + private static final QLogger LOG = QLogger.getLogger(QInstanceEnricher.class); private final QInstance qInstance; diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/instances/QInstanceValidator.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/instances/QInstanceValidator.java index cc600d00..ddcff476 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/instances/QInstanceValidator.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/instances/QInstanceValidator.java @@ -75,9 +75,8 @@ import com.kingsrook.qqq.backend.core.model.metadata.tables.automation.QTableAut import com.kingsrook.qqq.backend.core.model.metadata.tables.cache.CacheOf; import com.kingsrook.qqq.backend.core.model.metadata.tables.cache.CacheUseCase; import com.kingsrook.qqq.backend.core.utils.CollectionUtils; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.core.utils.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -92,7 +91,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class QInstanceValidator { - private static final Logger LOG = LogManager.getLogger(QInstanceValidator.class); + private static final QLogger LOG = QLogger.getLogger(QInstanceValidator.class); private boolean printWarnings = false; diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/instances/QMetaDataVariableInterpreter.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/instances/QMetaDataVariableInterpreter.java index 2e9421c3..a17bcaec 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/instances/QMetaDataVariableInterpreter.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/instances/QMetaDataVariableInterpreter.java @@ -29,11 +29,10 @@ import java.util.LinkedHashMap; import java.util.Locale; import java.util.Map; import com.kingsrook.qqq.backend.core.exceptions.QException; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.core.utils.ValueUtils; import io.github.cdimascio.dotenv.Dotenv; import io.github.cdimascio.dotenv.DotenvEntry; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -49,7 +48,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class QMetaDataVariableInterpreter { - private static final Logger LOG = LogManager.getLogger(QMetaDataVariableInterpreter.class); + private static final QLogger LOG = QLogger.getLogger(QMetaDataVariableInterpreter.class); private Map environmentOverrides; private Map> valueMaps; diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/AbstractActionInput.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/AbstractActionInput.java index 2edbe935..74c55a49 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/AbstractActionInput.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/AbstractActionInput.java @@ -31,8 +31,7 @@ import com.kingsrook.qqq.backend.core.instances.QInstanceValidator; import com.kingsrook.qqq.backend.core.model.metadata.QInstance; import com.kingsrook.qqq.backend.core.model.metadata.authentication.QAuthenticationMetaData; import com.kingsrook.qqq.backend.core.model.session.QSession; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -41,7 +40,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class AbstractActionInput { - private static final Logger LOG = LogManager.getLogger(AbstractActionInput.class); + private static final QLogger LOG = QLogger.getLogger(AbstractActionInput.class); private AsyncJobCallback asyncJobCallback; diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/QFilterCriteria.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/QFilterCriteria.java index 47b3d45d..7134202f 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/QFilterCriteria.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/QFilterCriteria.java @@ -27,9 +27,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import com.kingsrook.qqq.backend.core.utils.CollectionUtils; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.core.utils.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -38,7 +37,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class QFilterCriteria implements Serializable, Cloneable { - private static final Logger LOG = LogManager.getLogger(QFilterCriteria.class); + private static final QLogger LOG = QLogger.getLogger(QFilterCriteria.class); private String fieldName; private QCriteriaOperator operator; diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/QQueryFilter.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/QQueryFilter.java index ba90465c..cbb2fb25 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/QQueryFilter.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/QQueryFilter.java @@ -27,8 +27,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import com.kingsrook.qqq.backend.core.utils.CollectionUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -37,7 +36,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class QQueryFilter implements Serializable, Cloneable { - private static final Logger LOG = LogManager.getLogger(QQueryFilter.class); + private static final QLogger LOG = QLogger.getLogger(QQueryFilter.class); private List criteria = new ArrayList<>(); private List orderBys = new ArrayList<>(); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/QueryOutputRecordPipe.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/QueryOutputRecordPipe.java index 6f8ce386..a952c1bf 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/QueryOutputRecordPipe.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/QueryOutputRecordPipe.java @@ -25,8 +25,7 @@ package com.kingsrook.qqq.backend.core.model.actions.tables.query; import java.util.List; import com.kingsrook.qqq.backend.core.actions.reporting.RecordPipe; import com.kingsrook.qqq.backend.core.model.data.QRecord; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -34,7 +33,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ class QueryOutputRecordPipe implements QueryOutputStorageInterface { - private static final Logger LOG = LogManager.getLogger(QueryOutputRecordPipe.class); + private static final QLogger LOG = QLogger.getLogger(QueryOutputRecordPipe.class); private RecordPipe recordPipe; diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/data/QRecordEntity.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/data/QRecordEntity.java index cc2f1a9b..f10ec313 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/data/QRecordEntity.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/data/QRecordEntity.java @@ -37,8 +37,7 @@ import java.util.Optional; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.exceptions.QRuntimeException; import com.kingsrook.qqq.backend.core.utils.ListingHash; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -46,7 +45,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public abstract class QRecordEntity { - private static final Logger LOG = LogManager.getLogger(QRecordEntity.class); + private static final QLogger LOG = QLogger.getLogger(QRecordEntity.class); private static final ListingHash, QRecordEntityField> fieldMapping = new ListingHash<>(); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/data/QRecordEnum.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/data/QRecordEnum.java index bb8bf551..99a2f14d 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/data/QRecordEnum.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/data/QRecordEnum.java @@ -35,8 +35,7 @@ import java.util.Locale; import java.util.Optional; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.utils.ListingHash; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -44,7 +43,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public interface QRecordEnum { - Logger LOG = LogManager.getLogger(QRecordEnum.class); + QLogger LOG = QLogger.getLogger(QRecordEnum.class); ListingHash, QRecordEntityField> fieldMapping = new ListingHash<>(); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/serialization/DeserializerUtils.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/serialization/DeserializerUtils.java index 036a4d85..93a7e4f4 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/serialization/DeserializerUtils.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/metadata/serialization/DeserializerUtils.java @@ -43,10 +43,9 @@ import com.fasterxml.jackson.databind.node.TextNode; import com.kingsrook.qqq.backend.core.exceptions.QModuleDispatchException; import com.kingsrook.qqq.backend.core.modules.backend.QBackendModuleDispatcher; import com.kingsrook.qqq.backend.core.modules.backend.QBackendModuleInterface; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.core.utils.StringUtils; import com.kingsrook.qqq.backend.core.utils.ValueUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -56,7 +55,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class DeserializerUtils { - private static final Logger LOG = LogManager.getLogger(DeserializerUtils.class); + private static final QLogger LOG = QLogger.getLogger(DeserializerUtils.class); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/modules/authentication/implementations/Auth0AuthenticationModule.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/modules/authentication/implementations/Auth0AuthenticationModule.java index 5560fb09..e435ca95 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/modules/authentication/implementations/Auth0AuthenticationModule.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/modules/authentication/implementations/Auth0AuthenticationModule.java @@ -56,9 +56,8 @@ import com.kingsrook.qqq.backend.core.modules.authentication.QAuthenticationModu import com.kingsrook.qqq.backend.core.state.InMemoryStateProvider; import com.kingsrook.qqq.backend.core.state.SimpleStateKey; import com.kingsrook.qqq.backend.core.state.StateProviderInterface; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.core.utils.ValueUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.json.JSONArray; import org.json.JSONObject; @@ -68,7 +67,7 @@ import org.json.JSONObject; *******************************************************************************/ public class Auth0AuthenticationModule implements QAuthenticationModuleInterface { - private static final Logger LOG = LogManager.getLogger(Auth0AuthenticationModule.class); + private static final QLogger LOG = QLogger.getLogger(Auth0AuthenticationModule.class); ///////////////////////////////////////////////////////////////////////////////////////////////////////////// // 30 minutes - ideally this would be lower, but right now we've been dealing with re-validation issues... // diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/modules/authentication/implementations/MockAuthenticationModule.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/modules/authentication/implementations/MockAuthenticationModule.java index afc2cc39..45809f3b 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/modules/authentication/implementations/MockAuthenticationModule.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/modules/authentication/implementations/MockAuthenticationModule.java @@ -28,8 +28,7 @@ import com.kingsrook.qqq.backend.core.model.metadata.QInstance; import com.kingsrook.qqq.backend.core.model.session.QSession; import com.kingsrook.qqq.backend.core.model.session.QUser; import com.kingsrook.qqq.backend.core.modules.authentication.QAuthenticationModuleInterface; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -37,8 +36,9 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class MockAuthenticationModule implements QAuthenticationModuleInterface { - private static final Logger logger = LogManager.getLogger(MockAuthenticationModule.class); - private static final int USER_ID_MODULO = 10_000; + private static final QLogger logger = QLogger.getLogger(MockAuthenticationModule.class); + private static final int USER_ID_MODULO = 10_000; + /******************************************************************************* diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/modules/authentication/implementations/TableBasedAuthenticationModule.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/modules/authentication/implementations/TableBasedAuthenticationModule.java index 0b9a782d..c8aed8bd 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/modules/authentication/implementations/TableBasedAuthenticationModule.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/modules/authentication/implementations/TableBasedAuthenticationModule.java @@ -56,8 +56,7 @@ import com.kingsrook.qqq.backend.core.state.InMemoryStateProvider; import com.kingsrook.qqq.backend.core.state.SimpleStateKey; import com.kingsrook.qqq.backend.core.state.StateProviderInterface; import com.kingsrook.qqq.backend.core.utils.CollectionUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -65,7 +64,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class TableBasedAuthenticationModule implements QAuthenticationModuleInterface { - private static final Logger LOG = LogManager.getLogger(TableBasedAuthenticationModule.class); + private static final QLogger LOG = QLogger.getLogger(TableBasedAuthenticationModule.class); ///////////////////////////////////////////////////////////////////////////////////////////////////////////// // 30 minutes - ideally this would be lower, but right now we've been dealing with re-validation issues... // diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/modules/backend/QBackendModuleDispatcher.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/modules/backend/QBackendModuleDispatcher.java index 619dd5d4..243286ed 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/modules/backend/QBackendModuleDispatcher.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/modules/backend/QBackendModuleDispatcher.java @@ -26,8 +26,7 @@ import java.util.HashMap; import java.util.Map; import com.kingsrook.qqq.backend.core.exceptions.QModuleDispatchException; import com.kingsrook.qqq.backend.core.model.metadata.QBackendMetaData; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -39,7 +38,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class QBackendModuleDispatcher { - private static final Logger LOG = LogManager.getLogger(QBackendModuleDispatcher.class); + private static final QLogger LOG = QLogger.getLogger(QBackendModuleDispatcher.class); private static Map backendTypeToModuleClassNameMap; diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/modules/backend/implementations/mock/MockQueryAction.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/modules/backend/implementations/mock/MockQueryAction.java index ec0589fc..ab7518d8 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/modules/backend/implementations/mock/MockQueryAction.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/modules/backend/implementations/mock/MockQueryAction.java @@ -35,8 +35,7 @@ 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.tables.QTableMetaData; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -45,7 +44,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class MockQueryAction implements QueryInterface { - private static final Logger LOG = LogManager.getLogger(MockQueryAction.class); + private static final QLogger LOG = QLogger.getLogger(MockQueryAction.class); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/basic/BasicETLExtractFunction.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/basic/BasicETLExtractFunction.java index 6c158313..3830c2c0 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/basic/BasicETLExtractFunction.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/basic/BasicETLExtractFunction.java @@ -30,8 +30,7 @@ import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepInpu import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepOutput; import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryInput; import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryOutput; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -39,7 +38,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class BasicETLExtractFunction implements BackendStep { - private static final Logger LOG = LogManager.getLogger(BasicETLExtractFunction.class); + private static final QLogger LOG = QLogger.getLogger(BasicETLExtractFunction.class); private RecordPipe recordPipe = null; diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/basic/BasicETLLoadFunction.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/basic/BasicETLLoadFunction.java index a25bf4cb..a3f50330 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/basic/BasicETLLoadFunction.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/basic/BasicETLLoadFunction.java @@ -34,8 +34,7 @@ import com.kingsrook.qqq.backend.core.model.actions.tables.insert.InsertInput; import com.kingsrook.qqq.backend.core.model.actions.tables.insert.InsertOutput; import com.kingsrook.qqq.backend.core.model.data.QRecord; import com.kingsrook.qqq.backend.core.utils.CollectionUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -43,7 +42,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class BasicETLLoadFunction implements BackendStep { - private static final Logger LOG = LogManager.getLogger(BasicETLLoadFunction.class); + private static final QLogger LOG = QLogger.getLogger(BasicETLLoadFunction.class); private QBackendTransaction transaction; private boolean returnStoredRecords = true; diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/basic/BasicETLTransformFunction.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/basic/BasicETLTransformFunction.java index 6ef8f44d..84583ab1 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/basic/BasicETLTransformFunction.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/basic/BasicETLTransformFunction.java @@ -38,9 +38,8 @@ 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.tables.QTableMetaData; import com.kingsrook.qqq.backend.core.utils.CollectionUtils; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.core.utils.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -48,7 +47,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class BasicETLTransformFunction implements BackendStep { - private static final Logger LOG = LogManager.getLogger(BasicETLTransformFunction.class); + private static final QLogger LOG = QLogger.getLogger(BasicETLTransformFunction.class); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/streamed/StreamedETLBackendStep.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/streamed/StreamedETLBackendStep.java index 0969e4a8..b311fd63 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/streamed/StreamedETLBackendStep.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/streamed/StreamedETLBackendStep.java @@ -37,8 +37,7 @@ import com.kingsrook.qqq.backend.core.processes.implementations.etl.basic.BasicE import com.kingsrook.qqq.backend.core.processes.implementations.etl.basic.BasicETLLoadFunction; import com.kingsrook.qqq.backend.core.processes.implementations.etl.basic.BasicETLProcess; import com.kingsrook.qqq.backend.core.processes.implementations.etl.basic.BasicETLTransformFunction; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -46,7 +45,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class StreamedETLBackendStep implements BackendStep { - private static final Logger LOG = LogManager.getLogger(StreamedETLBackendStep.class); + private static final QLogger LOG = QLogger.getLogger(StreamedETLBackendStep.class); private static final int TIMEOUT_AFTER_NO_RECORDS_MS = 10 * 60 * 1000; diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/streamedwithfrontend/BaseStreamedETLStep.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/streamedwithfrontend/BaseStreamedETLStep.java index 2dd6c0ef..4e937cf0 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/streamedwithfrontend/BaseStreamedETLStep.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/streamedwithfrontend/BaseStreamedETLStep.java @@ -32,8 +32,7 @@ import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepOutp import com.kingsrook.qqq.backend.core.model.data.QRecord; import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeReference; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -41,7 +40,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class BaseStreamedETLStep { - private static final Logger LOG = LogManager.getLogger(BaseStreamedETLStep.class); + private static final QLogger LOG = QLogger.getLogger(BaseStreamedETLStep.class); protected static final int PROCESS_OUTPUT_RECORD_LIST_LIMIT = 20; diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/streamedwithfrontend/StreamedETLExecuteStep.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/streamedwithfrontend/StreamedETLExecuteStep.java index b9c976f4..94e008f5 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/streamedwithfrontend/StreamedETLExecuteStep.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/streamedwithfrontend/StreamedETLExecuteStep.java @@ -34,8 +34,7 @@ import com.kingsrook.qqq.backend.core.exceptions.QException; 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 org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -45,7 +44,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class StreamedETLExecuteStep extends BaseStreamedETLStep implements BackendStep { - private static final Logger LOG = LogManager.getLogger(StreamedETLExecuteStep.class); + private static final QLogger LOG = QLogger.getLogger(StreamedETLExecuteStep.class); private int currentRowCount = 1; diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/streamedwithfrontend/StreamedETLPreviewStep.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/streamedwithfrontend/StreamedETLPreviewStep.java index b566c817..9df0da47 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/streamedwithfrontend/StreamedETLPreviewStep.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/streamedwithfrontend/StreamedETLPreviewStep.java @@ -36,9 +36,8 @@ import com.kingsrook.qqq.backend.core.model.metadata.QBackendMetaData; import com.kingsrook.qqq.backend.core.model.metadata.tables.Capability; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; import com.kingsrook.qqq.backend.core.processes.implementations.etl.streamed.StreamedETLProcess; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.core.utils.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -46,7 +45,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class StreamedETLPreviewStep extends BaseStreamedETLStep implements BackendStep { - private static final Logger LOG = LogManager.getLogger(StreamedETLPreviewStep.class); + private static final QLogger LOG = QLogger.getLogger(StreamedETLPreviewStep.class); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/streamedwithfrontend/StreamedETLValidateStep.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/streamedwithfrontend/StreamedETLValidateStep.java index c0b9612d..0512485e 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/streamedwithfrontend/StreamedETLValidateStep.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/streamedwithfrontend/StreamedETLValidateStep.java @@ -31,8 +31,7 @@ import com.kingsrook.qqq.backend.core.exceptions.QException; 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 org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -40,7 +39,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class StreamedETLValidateStep extends BaseStreamedETLStep implements BackendStep { - private static final Logger LOG = LogManager.getLogger(StreamedETLValidateStep.class); + private static final QLogger LOG = QLogger.getLogger(StreamedETLValidateStep.class); private int currentRowCount = 1; diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/mock/MockBackendStep.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/mock/MockBackendStep.java index 6b2607a3..59f0bcae 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/mock/MockBackendStep.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/mock/MockBackendStep.java @@ -27,8 +27,7 @@ import com.kingsrook.qqq.backend.core.actions.processes.RunProcessAction; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepInput; import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepOutput; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -38,7 +37,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class MockBackendStep implements BackendStep { - private static final Logger LOG = LogManager.getLogger(MockBackendStep.class); + private static final QLogger LOG = QLogger.getLogger(MockBackendStep.class); public static final String FIELD_GREETING_PREFIX = "greetingPrefix"; public static final String FIELD_GREETING_SUFFIX = "greetingSuffix"; diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/scheduler/ScheduleManager.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/scheduler/ScheduleManager.java index 8a1a76d8..0e0fdc8b 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/scheduler/ScheduleManager.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/scheduler/ScheduleManager.java @@ -40,8 +40,7 @@ import com.kingsrook.qqq.backend.core.model.metadata.queues.QQueueProviderMetaDa import com.kingsrook.qqq.backend.core.model.metadata.queues.SQSQueueProviderMetaData; import com.kingsrook.qqq.backend.core.model.metadata.scheduleing.QScheduleMetaData; import com.kingsrook.qqq.backend.core.model.session.QSession; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -56,7 +55,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class ScheduleManager { - private static final Logger LOG = LogManager.getLogger(ScheduleManager.class); + private static final QLogger LOG = QLogger.getLogger(ScheduleManager.class); private static ScheduleManager scheduleManager = null; private final QInstance qInstance; diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/scheduler/StandardScheduledExecutor.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/scheduler/StandardScheduledExecutor.java index c4d290ba..f33386de 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/scheduler/StandardScheduledExecutor.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/scheduler/StandardScheduledExecutor.java @@ -29,8 +29,7 @@ import java.util.concurrent.TimeUnit; import java.util.function.Supplier; import com.kingsrook.qqq.backend.core.model.metadata.QInstance; import com.kingsrook.qqq.backend.core.model.session.QSession; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -40,7 +39,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class StandardScheduledExecutor { - private static final Logger LOG = LogManager.getLogger(StandardScheduledExecutor.class); + private static final QLogger LOG = QLogger.getLogger(StandardScheduledExecutor.class); private Integer initialDelayMillis = 3000; private Integer delayMillis = 1000; diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/state/TempFileStateProvider.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/state/TempFileStateProvider.java index ed6df69d..eebf754b 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/state/TempFileStateProvider.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/state/TempFileStateProvider.java @@ -28,9 +28,8 @@ import java.io.IOException; import java.io.Serializable; import java.util.Optional; import com.kingsrook.qqq.backend.core.utils.JsonUtils; +import com.kingsrook.qqq.backend.core.utils.QLogger; import org.apache.commons.io.FileUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -38,7 +37,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class TempFileStateProvider implements StateProviderInterface { - private static final Logger LOG = LogManager.getLogger(TempFileStateProvider.class); + private static final QLogger LOG = QLogger.getLogger(TempFileStateProvider.class); private static TempFileStateProvider instance; diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/utils/JsonUtils.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/utils/JsonUtils.java index ff53ab6e..6ea57bfc 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/utils/JsonUtils.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/utils/JsonUtils.java @@ -37,8 +37,6 @@ import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.kingsrook.qqq.backend.core.model.data.QRecord; import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; @@ -52,7 +50,7 @@ import org.json.JSONObject; *******************************************************************************/ public class JsonUtils { - private static final Logger LOG = LogManager.getLogger(JsonUtils.class); + private static final QLogger LOG = QLogger.getLogger(JsonUtils.class); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/utils/QLogger.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/utils/QLogger.java index bd3446d9..db6c34b8 100755 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/utils/QLogger.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/utils/QLogger.java @@ -26,6 +26,7 @@ import java.util.HashMap; import java.util.Map; import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.model.session.QSession; +import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -61,6 +62,76 @@ public class QLogger + /******************************************************************************* + ** + *******************************************************************************/ + public void log(Level level, String message) + { + logger.log(level, wrapMessage(message)); + } + + + + /******************************************************************************* + ** + *******************************************************************************/ + public void log(Level level, String message, Throwable t) + { + logger.log(level, wrapMessage(message), t); + } + + + + /******************************************************************************* + ** + *******************************************************************************/ + public void log(Level level, Throwable t) + { + logger.log(level, t); + } + + + + /******************************************************************************* + ** + *******************************************************************************/ + public void trace(String message) + { + logger.trace(wrapMessage(message)); + } + + + + /******************************************************************************* + ** + *******************************************************************************/ + public void trace(String message, Object... values) + { + logger.trace(wrapMessage(message), values); + } + + + + /******************************************************************************* + ** + *******************************************************************************/ + public void trace(String message, Throwable t) + { + logger.trace(wrapMessage(message), t); + } + + + + /******************************************************************************* + ** + *******************************************************************************/ + public void trace(Throwable t) + { + logger.trace(t); + } + + + /******************************************************************************* ** *******************************************************************************/ @@ -71,6 +142,36 @@ public class QLogger + /******************************************************************************* + ** + *******************************************************************************/ + public void debug(String message, Object... values) + { + logger.debug(wrapMessage(message), values); + } + + + + /******************************************************************************* + ** + *******************************************************************************/ + public void debug(String message, Throwable t) + { + logger.debug(wrapMessage(message), t); + } + + + + /******************************************************************************* + ** + *******************************************************************************/ + public void debug(Throwable t) + { + logger.debug(t); + } + + + /******************************************************************************* ** *******************************************************************************/ @@ -81,6 +182,36 @@ public class QLogger + /******************************************************************************* + ** + *******************************************************************************/ + public void info(String message, Object... values) + { + logger.info(wrapMessage(message), values); + } + + + + /******************************************************************************* + ** + *******************************************************************************/ + public void info(String message, Throwable t) + { + logger.info(wrapMessage(message), t); + } + + + + /******************************************************************************* + ** + *******************************************************************************/ + public void info(Throwable t) + { + logger.info(t); + } + + + /******************************************************************************* ** *******************************************************************************/ @@ -91,6 +222,16 @@ public class QLogger + /******************************************************************************* + ** + *******************************************************************************/ + public void warn(String message, Object... values) + { + logger.warn(wrapMessage(message), values); + } + + + /******************************************************************************* ** *******************************************************************************/ @@ -101,6 +242,16 @@ public class QLogger + /******************************************************************************* + ** + *******************************************************************************/ + public void warn(Throwable t) + { + logger.warn(t); + } + + + /******************************************************************************* ** *******************************************************************************/ @@ -111,6 +262,16 @@ public class QLogger + /******************************************************************************* + ** + *******************************************************************************/ + public void error(String message, Object... values) + { + logger.error(wrapMessage(message), values); + } + + + /******************************************************************************* ** *******************************************************************************/ @@ -121,6 +282,16 @@ public class QLogger + /******************************************************************************* + ** + *******************************************************************************/ + public void error(Throwable t) + { + logger.error(t); + } + + + /******************************************************************************* ** *******************************************************************************/ diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/utils/Timer.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/utils/Timer.java index 99dcfdf9..24244900 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/utils/Timer.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/utils/Timer.java @@ -23,8 +23,6 @@ package com.kingsrook.qqq.backend.core.utils; import org.apache.logging.log4j.Level; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -32,7 +30,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class Timer { - private static final Logger LOG = LogManager.getLogger(Timer.class); + private static final QLogger LOG = QLogger.getLogger(Timer.class); private String name; private long start; diff --git a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/BaseTest.java b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/BaseTest.java index 258e7026..ad736e99 100644 --- a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/BaseTest.java +++ b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/BaseTest.java @@ -8,9 +8,8 @@ package com.kingsrook.qqq.backend.core; import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.model.metadata.QInstance; import com.kingsrook.qqq.backend.core.model.session.QSession; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.core.utils.TestUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -20,7 +19,7 @@ import org.junit.jupiter.api.BeforeEach; *******************************************************************************/ public class BaseTest { - private static final Logger LOG = LogManager.getLogger(BaseTest.class); + private static final QLogger LOG = QLogger.getLogger(BaseTest.class); diff --git a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/actions/customizers/ChildInserterPostInsertCustomizerTest.java b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/actions/customizers/ChildInserterPostInsertCustomizerTest.java index 614d8dd1..ce6880d7 100644 --- a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/actions/customizers/ChildInserterPostInsertCustomizerTest.java +++ b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/actions/customizers/ChildInserterPostInsertCustomizerTest.java @@ -34,7 +34,6 @@ 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.code.QCodeReference; import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeUsage; -import com.kingsrook.qqq.backend.core.model.session.QSession; import com.kingsrook.qqq.backend.core.modules.backend.implementations.memory.MemoryRecordStore; import com.kingsrook.qqq.backend.core.utils.TestUtils; import org.junit.jupiter.api.AfterEach; diff --git a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/actions/processes/RunProcessTest.java b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/actions/processes/RunProcessTest.java index e39aa08a..c16a17b3 100644 --- a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/actions/processes/RunProcessTest.java +++ b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/actions/processes/RunProcessTest.java @@ -56,10 +56,9 @@ import com.kingsrook.qqq.backend.core.model.metadata.processes.QStepMetaData; import com.kingsrook.qqq.backend.core.processes.implementations.mock.MockBackendStep; import com.kingsrook.qqq.backend.core.state.StateType; import com.kingsrook.qqq.backend.core.state.UUIDAndTypeStateKey; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.core.utils.TestUtils; import com.kingsrook.qqq.backend.core.utils.ValueUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -77,7 +76,7 @@ import static org.junit.jupiter.api.Assertions.fail; *******************************************************************************/ public class RunProcessTest extends BaseTest { - private static final Logger LOG = LogManager.getLogger(RunProcessTest.class); + private static final QLogger LOG = QLogger.getLogger(RunProcessTest.class); diff --git a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/utils/LogUtilsTest.java b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/utils/LogUtilsTest.java index 3d7b6d7b..7c581319 100644 --- a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/utils/LogUtilsTest.java +++ b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/utils/LogUtilsTest.java @@ -24,8 +24,6 @@ package com.kingsrook.qqq.backend.core.utils; import java.math.BigDecimal; import com.kingsrook.qqq.backend.core.BaseTest; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.junit.jupiter.api.Test; import static com.kingsrook.qqq.backend.core.utils.LogUtils.jsonLog; import static com.kingsrook.qqq.backend.core.utils.LogUtils.logPair; @@ -37,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; *******************************************************************************/ class LogUtilsTest extends BaseTest { - private static final Logger LOG = LogManager.getLogger(LogUtilsTest.class); + private static final QLogger LOG = QLogger.getLogger(LogUtilsTest.class); diff --git a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/utils/TestUtils.java b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/utils/TestUtils.java index 3324706e..83288c82 100644 --- a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/utils/TestUtils.java +++ b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/utils/TestUtils.java @@ -107,8 +107,6 @@ import com.kingsrook.qqq.backend.core.processes.implementations.etl.basic.BasicE import com.kingsrook.qqq.backend.core.processes.implementations.etl.streamed.StreamedETLProcess; import com.kingsrook.qqq.backend.core.processes.implementations.mock.MockBackendStep; import com.kingsrook.qqq.backend.core.processes.implementations.reports.RunReportForRecordProcess; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -117,7 +115,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class TestUtils { - private static final Logger LOG = LogManager.getLogger(TestUtils.class); + private static final QLogger LOG = QLogger.getLogger(TestUtils.class); public static final String DEFAULT_BACKEND_NAME = "default"; public static final String MEMORY_BACKEND_NAME = "memory"; diff --git a/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/APIInsertAction.java b/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/APIInsertAction.java index 5d173b4c..7db6259d 100644 --- a/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/APIInsertAction.java +++ b/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/APIInsertAction.java @@ -27,8 +27,7 @@ import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.model.actions.tables.insert.InsertInput; import com.kingsrook.qqq.backend.core.model.actions.tables.insert.InsertOutput; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -36,7 +35,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class APIInsertAction extends AbstractAPIAction implements InsertInterface { - private static final Logger LOG = LogManager.getLogger(APIInsertAction.class); + private static final QLogger LOG = QLogger.getLogger(APIInsertAction.class); diff --git a/qqq-backend-module-api/src/test/java/com/kingsrook/qqq/backend/module/api/BaseTest.java b/qqq-backend-module-api/src/test/java/com/kingsrook/qqq/backend/module/api/BaseTest.java index fdd3d3bc..1c3d740c 100644 --- a/qqq-backend-module-api/src/test/java/com/kingsrook/qqq/backend/module/api/BaseTest.java +++ b/qqq-backend-module-api/src/test/java/com/kingsrook/qqq/backend/module/api/BaseTest.java @@ -8,8 +8,7 @@ package com.kingsrook.qqq.backend.module.api; import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.model.metadata.QInstance; import com.kingsrook.qqq.backend.core.model.session.QSession; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -19,7 +18,7 @@ import org.junit.jupiter.api.BeforeEach; *******************************************************************************/ public class BaseTest { - private static final Logger LOG = LogManager.getLogger(BaseTest.class); + private static final QLogger LOG = QLogger.getLogger(BaseTest.class); diff --git a/qqq-backend-module-api/src/test/java/com/kingsrook/qqq/backend/module/api/EasyPostApiTest.java b/qqq-backend-module-api/src/test/java/com/kingsrook/qqq/backend/module/api/EasyPostApiTest.java index 55eaa0a9..36b8ac3b 100644 --- a/qqq-backend-module-api/src/test/java/com/kingsrook/qqq/backend/module/api/EasyPostApiTest.java +++ b/qqq-backend-module-api/src/test/java/com/kingsrook/qqq/backend/module/api/EasyPostApiTest.java @@ -30,7 +30,6 @@ import com.kingsrook.qqq.backend.core.model.actions.tables.insert.InsertOutput; 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.QInstance; -import com.kingsrook.qqq.backend.core.model.session.QSession; import com.kingsrook.qqq.backend.module.api.model.metadata.APIBackendMetaData; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.condition.DisabledOnOs; diff --git a/qqq-backend-module-api/src/test/java/com/kingsrook/qqq/backend/module/api/EasyPostUtils.java b/qqq-backend-module-api/src/test/java/com/kingsrook/qqq/backend/module/api/EasyPostUtils.java index b81d03f8..783f01e1 100644 --- a/qqq-backend-module-api/src/test/java/com/kingsrook/qqq/backend/module/api/EasyPostUtils.java +++ b/qqq-backend-module-api/src/test/java/com/kingsrook/qqq/backend/module/api/EasyPostUtils.java @@ -8,11 +8,10 @@ package com.kingsrook.qqq.backend.module.api; import java.io.IOException; 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.utils.QLogger; import com.kingsrook.qqq.backend.module.api.actions.BaseAPIActionUtil; import org.apache.http.entity.AbstractHttpEntity; import org.apache.http.entity.StringEntity; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.json.JSONObject; @@ -21,7 +20,7 @@ import org.json.JSONObject; *******************************************************************************/ public class EasyPostUtils extends BaseAPIActionUtil { - private static final Logger LOG = LogManager.getLogger(EasyPostUtils.class); + private static final QLogger LOG = QLogger.getLogger(EasyPostUtils.class); diff --git a/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/base/actions/AbstractBaseFilesystemAction.java b/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/base/actions/AbstractBaseFilesystemAction.java index aed607d9..87e93ba1 100644 --- a/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/base/actions/AbstractBaseFilesystemAction.java +++ b/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/base/actions/AbstractBaseFilesystemAction.java @@ -43,6 +43,7 @@ import com.kingsrook.qqq.backend.core.model.metadata.QInstance; 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.QLogger; import com.kingsrook.qqq.backend.core.utils.StringUtils; import com.kingsrook.qqq.backend.module.filesystem.base.FilesystemRecordBackendDetailFields; import com.kingsrook.qqq.backend.module.filesystem.base.model.metadata.AbstractFilesystemBackendMetaData; @@ -51,8 +52,6 @@ import com.kingsrook.qqq.backend.module.filesystem.base.model.metadata.Cardinali import com.kingsrook.qqq.backend.module.filesystem.exceptions.FilesystemException; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.NotImplementedException; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -63,7 +62,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public abstract class AbstractBaseFilesystemAction { - private static final Logger LOG = LogManager.getLogger(AbstractBaseFilesystemAction.class); + private static final QLogger LOG = QLogger.getLogger(AbstractBaseFilesystemAction.class); diff --git a/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/FilesystemBackendModule.java b/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/FilesystemBackendModule.java index 493a08ac..4a07d003 100644 --- a/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/FilesystemBackendModule.java +++ b/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/FilesystemBackendModule.java @@ -31,6 +31,7 @@ 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.tables.QTableBackendDetails; import com.kingsrook.qqq.backend.core.modules.backend.QBackendModuleInterface; +import com.kingsrook.qqq.backend.core.utils.QLogger; 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; @@ -41,8 +42,6 @@ import com.kingsrook.qqq.backend.module.filesystem.local.actions.FilesystemQuery import com.kingsrook.qqq.backend.module.filesystem.local.actions.FilesystemUpdateAction; import com.kingsrook.qqq.backend.module.filesystem.local.model.metadata.FilesystemBackendMetaData; import com.kingsrook.qqq.backend.module.filesystem.local.model.metadata.FilesystemTableBackendDetails; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -50,7 +49,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class FilesystemBackendModule implements QBackendModuleInterface, FilesystemBackendModuleInterface { - private static final Logger LOG = LogManager.getLogger(FilesystemBackendModule.class); + private static final QLogger LOG = QLogger.getLogger(FilesystemBackendModule.class); @@ -109,6 +108,7 @@ public class FilesystemBackendModule implements QBackendModuleInterface, Filesys } + /******************************************************************************* ** *******************************************************************************/ diff --git a/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/AbstractFilesystemAction.java b/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/AbstractFilesystemAction.java index f1110b54..9181d27f 100644 --- a/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/AbstractFilesystemAction.java +++ b/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/AbstractFilesystemAction.java @@ -32,11 +32,10 @@ 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.tables.QTableMetaData; +import com.kingsrook.qqq.backend.core.utils.QLogger; 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; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -44,7 +43,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class AbstractFilesystemAction extends AbstractBaseFilesystemAction { - private static final Logger LOG = LogManager.getLogger(AbstractFilesystemAction.class); + private static final QLogger LOG = QLogger.getLogger(AbstractFilesystemAction.class); diff --git a/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/etl/basic/BasicETLCleanupSourceFilesStep.java b/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/etl/basic/BasicETLCleanupSourceFilesStep.java index c6fea88a..d45ec628 100644 --- a/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/etl/basic/BasicETLCleanupSourceFilesStep.java +++ b/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/etl/basic/BasicETLCleanupSourceFilesStep.java @@ -39,11 +39,10 @@ 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.QLogger; 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.actions.AbstractBaseFilesystemAction; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -52,7 +51,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class BasicETLCleanupSourceFilesStep implements BackendStep { - private static final Logger LOG = LogManager.getLogger(BasicETLCleanupSourceFilesStep.class); + private static final QLogger LOG = QLogger.getLogger(BasicETLCleanupSourceFilesStep.class); public static final String FIELD_MOVE_OR_DELETE = "moveOrDelete"; public static final String FIELD_DESTINATION_FOR_MOVES = "destinationForMoves"; diff --git a/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/filesystem/sync/FilesystemSyncStep.java b/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/filesystem/sync/FilesystemSyncStep.java index 1ea36990..e919920f 100644 --- a/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/filesystem/sync/FilesystemSyncStep.java +++ b/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/filesystem/sync/FilesystemSyncStep.java @@ -35,10 +35,9 @@ import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepOutp import com.kingsrook.qqq.backend.core.model.metadata.QBackendMetaData; 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.utils.QLogger; 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; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -49,7 +48,7 @@ import org.apache.logging.log4j.Logger; @SuppressWarnings("unchecked") public class FilesystemSyncStep implements BackendStep { - private static final Logger LOG = LogManager.getLogger(FilesystemSyncStep.class); + private static final QLogger LOG = QLogger.getLogger(FilesystemSyncStep.class); public static final String STEP_NAME = "sync"; @@ -82,8 +81,8 @@ public class FilesystemSyncStep implements BackendStep AbstractBaseFilesystemAction processingActionBase = processingModule.getActionBase(); processingActionBase.preAction(processingBackend); - Integer maxFilesToSync = runBackendStepInput.getValueInteger(FilesystemSyncProcess.FIELD_MAX_FILES_TO_ARCHIVE); - int syncedFileCount = 0; + Integer maxFilesToSync = runBackendStepInput.getValueInteger(FilesystemSyncProcess.FIELD_MAX_FILES_TO_ARCHIVE); + int syncedFileCount = 0; for(Map.Entry sourceEntry : sourceFiles.entrySet()) { try diff --git a/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/AbstractS3Action.java b/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/AbstractS3Action.java index 2b697cc6..f037e6d0 100644 --- a/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/AbstractS3Action.java +++ b/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/AbstractS3Action.java @@ -33,14 +33,13 @@ 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.tables.QTableMetaData; +import com.kingsrook.qqq.backend.core.utils.QLogger; 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; import com.kingsrook.qqq.backend.module.filesystem.exceptions.FilesystemException; import com.kingsrook.qqq.backend.module.filesystem.s3.model.metadata.S3BackendMetaData; import com.kingsrook.qqq.backend.module.filesystem.s3.utils.S3Utils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -48,7 +47,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class AbstractS3Action extends AbstractBaseFilesystemAction { - private static final Logger LOG = LogManager.getLogger(AbstractS3Action.class); + private static final QLogger LOG = QLogger.getLogger(AbstractS3Action.class); private S3Utils s3Utils; diff --git a/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/utils/S3Utils.java b/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/utils/S3Utils.java index 9b537f95..e6a6bcef 100644 --- a/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/utils/S3Utils.java +++ b/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/s3/utils/S3Utils.java @@ -37,10 +37,9 @@ import com.amazonaws.services.s3.model.ListObjectsV2Request; import com.amazonaws.services.s3.model.ListObjectsV2Result; import com.amazonaws.services.s3.model.ObjectMetadata; import com.amazonaws.services.s3.model.S3ObjectSummary; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.module.filesystem.exceptions.FilesystemException; import com.kingsrook.qqq.backend.module.filesystem.local.actions.AbstractFilesystemAction; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -52,7 +51,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class S3Utils { - private static final Logger LOG = LogManager.getLogger(S3Utils.class); + private static final QLogger LOG = QLogger.getLogger(S3Utils.class); private AmazonS3 amazonS3; @@ -99,8 +98,8 @@ public class S3Utils } } - String pathMatcherArg = AbstractFilesystemAction.stripDuplicatedSlashes("glob:/" + path + "/" + glob); - PathMatcher pathMatcher = FileSystems.getDefault().getPathMatcher(pathMatcherArg); + String pathMatcherArg = AbstractFilesystemAction.stripDuplicatedSlashes("glob:/" + path + "/" + glob); + PathMatcher pathMatcher = FileSystems.getDefault().getPathMatcher(pathMatcherArg); ListObjectsV2Request listObjectsV2Request = new ListObjectsV2Request() .withBucketName(bucketName) diff --git a/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/BaseTest.java b/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/BaseTest.java index c2f30a82..5468fc8a 100644 --- a/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/BaseTest.java +++ b/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/BaseTest.java @@ -9,8 +9,7 @@ import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.model.metadata.QInstance; import com.kingsrook.qqq.backend.core.model.session.QSession; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -20,7 +19,7 @@ import org.junit.jupiter.api.BeforeEach; *******************************************************************************/ public class BaseTest { - private static final Logger LOG = LogManager.getLogger(BaseTest.class); + private static final QLogger LOG = QLogger.getLogger(BaseTest.class); diff --git a/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/TestUtils.java b/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/TestUtils.java index ef53bb8b..c209f6a5 100644 --- a/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/TestUtils.java +++ b/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/TestUtils.java @@ -30,6 +30,7 @@ import com.kingsrook.qqq.backend.core.instances.QInstanceValidator; import com.kingsrook.qqq.backend.core.model.metadata.QAuthenticationType; 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.authentication.QAuthenticationMetaData; import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeReference; import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData; import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldType; @@ -38,7 +39,6 @@ import com.kingsrook.qqq.backend.core.model.metadata.processes.QProcessMetaData; 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.implementations.MockAuthenticationModule; -import com.kingsrook.qqq.backend.core.model.metadata.authentication.QAuthenticationMetaData; import com.kingsrook.qqq.backend.core.processes.implementations.etl.streamed.StreamedETLProcess; import com.kingsrook.qqq.backend.module.filesystem.base.model.metadata.Cardinality; import com.kingsrook.qqq.backend.module.filesystem.base.model.metadata.RecordFormat; diff --git a/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/FilesystemInsertActionTest.java b/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/FilesystemInsertActionTest.java index 45bc870d..864f8757 100644 --- a/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/FilesystemInsertActionTest.java +++ b/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/local/actions/FilesystemInsertActionTest.java @@ -31,7 +31,6 @@ import com.kingsrook.qqq.backend.core.model.actions.tables.insert.InsertInput; import com.kingsrook.qqq.backend.core.model.actions.tables.insert.InsertOutput; 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.session.QSession; import com.kingsrook.qqq.backend.module.filesystem.TestUtils; import com.kingsrook.qqq.backend.module.filesystem.base.FilesystemRecordBackendDetailFields; import org.apache.commons.io.FileUtils; diff --git a/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/S3BackendModuleSubclassForTest.java b/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/S3BackendModuleSubclassForTest.java index 84e5189f..7709b1b2 100644 --- a/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/S3BackendModuleSubclassForTest.java +++ b/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/S3BackendModuleSubclassForTest.java @@ -22,8 +22,8 @@ package com.kingsrook.qqq.backend.module.filesystem.s3; -import com.amazonaws.services.s3.model.S3ObjectSummary; import cloud.localstack.awssdkv1.TestUtils; +import com.amazonaws.services.s3.model.S3ObjectSummary; import com.kingsrook.qqq.backend.module.filesystem.base.actions.AbstractBaseFilesystemAction; import com.kingsrook.qqq.backend.module.filesystem.s3.actions.AbstractS3Action; import com.kingsrook.qqq.backend.module.filesystem.s3.utils.S3Utils; diff --git a/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/AbstractS3ActionTest.java b/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/AbstractS3ActionTest.java index 5ffe69b6..88914a3c 100644 --- a/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/AbstractS3ActionTest.java +++ b/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/AbstractS3ActionTest.java @@ -27,7 +27,8 @@ import com.amazonaws.services.s3.AmazonS3; import com.kingsrook.qqq.backend.core.model.metadata.QBackendMetaData; import com.kingsrook.qqq.backend.module.filesystem.s3.model.metadata.S3BackendMetaData; import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; /******************************************************************************* diff --git a/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/S3InsertActionTest.java b/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/S3InsertActionTest.java index 594a84ba..b7f2da69 100644 --- a/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/S3InsertActionTest.java +++ b/qqq-backend-module-filesystem/src/test/java/com/kingsrook/qqq/backend/module/filesystem/s3/actions/S3InsertActionTest.java @@ -31,7 +31,6 @@ import com.kingsrook.qqq.backend.core.model.actions.tables.insert.InsertInput; import com.kingsrook.qqq.backend.core.model.actions.tables.insert.InsertOutput; 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.session.QSession; 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; diff --git a/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/AbstractRDBMSAction.java b/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/AbstractRDBMSAction.java index 14e854c0..fd21e25d 100644 --- a/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/AbstractRDBMSAction.java +++ b/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/AbstractRDBMSAction.java @@ -57,14 +57,13 @@ import com.kingsrook.qqq.backend.core.model.metadata.security.RecordSecurityLock 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.utils.CollectionUtils; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.core.utils.StringUtils; import com.kingsrook.qqq.backend.core.utils.ValueUtils; import com.kingsrook.qqq.backend.module.rdbms.jdbc.ConnectionManager; import com.kingsrook.qqq.backend.module.rdbms.jdbc.QueryManager; import com.kingsrook.qqq.backend.module.rdbms.model.metadata.RDBMSBackendMetaData; import com.kingsrook.qqq.backend.module.rdbms.model.metadata.RDBMSTableBackendDetails; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -72,7 +71,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public abstract class AbstractRDBMSAction implements QActionInterface { - private static final Logger LOG = LogManager.getLogger(AbstractRDBMSAction.class); + private static final QLogger LOG = QLogger.getLogger(AbstractRDBMSAction.class); diff --git a/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSAggregateAction.java b/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSAggregateAction.java index 5fe69135..7495c901 100644 --- a/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSAggregateAction.java +++ b/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSAggregateAction.java @@ -41,10 +41,9 @@ 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.tables.QTableMetaData; import com.kingsrook.qqq.backend.core.utils.CollectionUtils; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.core.utils.StringUtils; import com.kingsrook.qqq.backend.module.rdbms.jdbc.QueryManager; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -52,7 +51,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class RDBMSAggregateAction extends AbstractRDBMSAction implements AggregateInterface { - private static final Logger LOG = LogManager.getLogger(RDBMSAggregateAction.class); + private static final QLogger LOG = QLogger.getLogger(RDBMSAggregateAction.class); diff --git a/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSCountAction.java b/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSCountAction.java index e078cfee..914c577e 100644 --- a/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSCountAction.java +++ b/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSCountAction.java @@ -34,9 +34,8 @@ import com.kingsrook.qqq.backend.core.model.actions.tables.count.CountOutput; import com.kingsrook.qqq.backend.core.model.actions.tables.query.JoinsContext; import com.kingsrook.qqq.backend.core.model.actions.tables.query.QQueryFilter; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.module.rdbms.jdbc.QueryManager; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -44,7 +43,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class RDBMSCountAction extends AbstractRDBMSAction implements CountInterface { - private static final Logger LOG = LogManager.getLogger(RDBMSCountAction.class); + private static final QLogger LOG = QLogger.getLogger(RDBMSCountAction.class); diff --git a/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSDeleteAction.java b/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSDeleteAction.java index bf6a20b0..02fa4ee6 100644 --- a/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSDeleteAction.java +++ b/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSDeleteAction.java @@ -37,9 +37,8 @@ import com.kingsrook.qqq.backend.core.model.actions.tables.query.JoinsContext; import com.kingsrook.qqq.backend.core.model.actions.tables.query.QQueryFilter; 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.utils.QLogger; import com.kingsrook.qqq.backend.module.rdbms.jdbc.QueryManager; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -47,7 +46,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class RDBMSDeleteAction extends AbstractRDBMSAction implements DeleteInterface { - private static final Logger LOG = LogManager.getLogger(RDBMSDeleteAction.class); + private static final QLogger LOG = QLogger.getLogger(RDBMSDeleteAction.class); diff --git a/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSInsertAction.java b/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSInsertAction.java index b8dcb203..1190910d 100644 --- a/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSInsertAction.java +++ b/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSInsertAction.java @@ -36,9 +36,8 @@ import com.kingsrook.qqq.backend.core.model.data.QRecord; import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; import com.kingsrook.qqq.backend.core.utils.CollectionUtils; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.module.rdbms.jdbc.QueryManager; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -46,7 +45,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class RDBMSInsertAction extends AbstractRDBMSAction implements InsertInterface { - private static final Logger LOG = LogManager.getLogger(RDBMSInsertAction.class); + private static final QLogger LOG = QLogger.getLogger(RDBMSInsertAction.class); diff --git a/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSQueryAction.java b/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSQueryAction.java index 00b02138..a8581fa6 100644 --- a/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSQueryAction.java +++ b/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSQueryAction.java @@ -44,10 +44,9 @@ 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.tables.QTableMetaData; import com.kingsrook.qqq.backend.core.utils.CollectionUtils; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.module.rdbms.jdbc.QueryManager; import com.kingsrook.qqq.backend.module.rdbms.model.metadata.RDBMSBackendMetaData; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -55,7 +54,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class RDBMSQueryAction extends AbstractRDBMSAction implements QueryInterface { - private static final Logger LOG = LogManager.getLogger(RDBMSQueryAction.class); + private static final QLogger LOG = QLogger.getLogger(RDBMSQueryAction.class); diff --git a/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSTransaction.java b/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSTransaction.java index 59e8209b..4d478195 100644 --- a/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSTransaction.java +++ b/qqq-backend-module-rdbms/src/main/java/com/kingsrook/qqq/backend/module/rdbms/actions/RDBMSTransaction.java @@ -26,8 +26,7 @@ import java.sql.Connection; import java.sql.SQLException; import com.kingsrook.qqq.backend.core.actions.QBackendTransaction; import com.kingsrook.qqq.backend.core.exceptions.QException; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; /******************************************************************************* @@ -37,7 +36,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class RDBMSTransaction extends QBackendTransaction { - private static final Logger LOG = LogManager.getLogger(RDBMSTransaction.class); + private static final QLogger LOG = QLogger.getLogger(RDBMSTransaction.class); private Connection connection; diff --git a/qqq-backend-module-rdbms/src/test/java/com/kingsrook/qqq/backend/module/rdbms/BaseTest.java b/qqq-backend-module-rdbms/src/test/java/com/kingsrook/qqq/backend/module/rdbms/BaseTest.java index 25e9c910..44c50a77 100644 --- a/qqq-backend-module-rdbms/src/test/java/com/kingsrook/qqq/backend/module/rdbms/BaseTest.java +++ b/qqq-backend-module-rdbms/src/test/java/com/kingsrook/qqq/backend/module/rdbms/BaseTest.java @@ -8,8 +8,7 @@ package com.kingsrook.qqq.backend.module.rdbms; import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.model.metadata.QInstance; import com.kingsrook.qqq.backend.core.model.session.QSession; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -19,7 +18,7 @@ import org.junit.jupiter.api.BeforeEach; *******************************************************************************/ public class BaseTest { - private static final Logger LOG = LogManager.getLogger(BaseTest.class); + private static final QLogger LOG = QLogger.getLogger(BaseTest.class); diff --git a/qqq-language-support-javascript/src/test/java/com/kingsrook/qqq/languages/javascript/BaseTest.java b/qqq-language-support-javascript/src/test/java/com/kingsrook/qqq/languages/javascript/BaseTest.java index a3fb4765..80fa7660 100644 --- a/qqq-language-support-javascript/src/test/java/com/kingsrook/qqq/languages/javascript/BaseTest.java +++ b/qqq-language-support-javascript/src/test/java/com/kingsrook/qqq/languages/javascript/BaseTest.java @@ -8,8 +8,7 @@ package com.kingsrook.qqq.languages.javascript; import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.model.metadata.QInstance; import com.kingsrook.qqq.backend.core.model.session.QSession; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; +import com.kingsrook.qqq.backend.core.utils.QLogger; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -19,7 +18,7 @@ import org.junit.jupiter.api.BeforeEach; *******************************************************************************/ public class BaseTest { - private static final Logger LOG = LogManager.getLogger(BaseTest.class); + private static final QLogger LOG = QLogger.getLogger(BaseTest.class); diff --git a/qqq-language-support-javascript/src/test/java/com/kingsrook/qqq/languages/javascript/TestUtils.java b/qqq-language-support-javascript/src/test/java/com/kingsrook/qqq/languages/javascript/TestUtils.java index eb29781a..a7eab8b5 100644 --- a/qqq-language-support-javascript/src/test/java/com/kingsrook/qqq/languages/javascript/TestUtils.java +++ b/qqq-language-support-javascript/src/test/java/com/kingsrook/qqq/languages/javascript/TestUtils.java @@ -25,10 +25,10 @@ package com.kingsrook.qqq.languages.javascript; import com.kingsrook.qqq.backend.core.model.metadata.QAuthenticationType; 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.authentication.QAuthenticationMetaData; 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.tables.QTableMetaData; -import com.kingsrook.qqq.backend.core.model.metadata.authentication.QAuthenticationMetaData; /******************************************************************************* diff --git a/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/backend/javalin/QJavalinImplementation.java b/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/backend/javalin/QJavalinImplementation.java index f99ae224..e3f6f98b 100644 --- a/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/backend/javalin/QJavalinImplementation.java +++ b/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/backend/javalin/QJavalinImplementation.java @@ -99,14 +99,13 @@ import com.kingsrook.qqq.backend.core.modules.authentication.QAuthenticationModu import com.kingsrook.qqq.backend.core.utils.CollectionUtils; import com.kingsrook.qqq.backend.core.utils.ExceptionUtils; import com.kingsrook.qqq.backend.core.utils.JsonUtils; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.core.utils.StringUtils; import com.kingsrook.qqq.backend.core.utils.ValueUtils; import io.javalin.Javalin; import io.javalin.apibuilder.EndpointGroup; import io.javalin.http.Context; import org.apache.commons.io.FileUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.eclipse.jetty.http.HttpStatus; import static io.javalin.apibuilder.ApiBuilder.delete; import static io.javalin.apibuilder.ApiBuilder.get; @@ -123,7 +122,7 @@ import static io.javalin.apibuilder.ApiBuilder.put; *******************************************************************************/ public class QJavalinImplementation { - private static final Logger LOG = LogManager.getLogger(QJavalinImplementation.class); + private static final QLogger LOG = QLogger.getLogger(QJavalinImplementation.class); private static final int SESSION_COOKIE_AGE = 60 * 60 * 24; private static final String SESSION_ID_COOKIE_NAME = "sessionId"; diff --git a/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/backend/javalin/QJavalinProcessHandler.java b/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/backend/javalin/QJavalinProcessHandler.java index 6a775b76..d32251b9 100644 --- a/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/backend/javalin/QJavalinProcessHandler.java +++ b/qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/backend/javalin/QJavalinProcessHandler.java @@ -79,14 +79,13 @@ import com.kingsrook.qqq.backend.core.state.UUIDAndTypeStateKey; import com.kingsrook.qqq.backend.core.utils.CollectionUtils; import com.kingsrook.qqq.backend.core.utils.ExceptionUtils; import com.kingsrook.qqq.backend.core.utils.JsonUtils; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.core.utils.StringUtils; import com.kingsrook.qqq.backend.core.utils.ValueUtils; import io.javalin.apibuilder.EndpointGroup; import io.javalin.http.Context; import io.javalin.http.UploadedFile; import org.apache.commons.lang.NotImplementedException; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.eclipse.jetty.http.HttpStatus; import static io.javalin.apibuilder.ApiBuilder.get; import static io.javalin.apibuilder.ApiBuilder.path; @@ -98,7 +97,7 @@ import static io.javalin.apibuilder.ApiBuilder.post; *******************************************************************************/ public class QJavalinProcessHandler { - private static final Logger LOG = LogManager.getLogger(QJavalinProcessHandler.class); + private static final QLogger LOG = QLogger.getLogger(QJavalinProcessHandler.class); private static int ASYNC_STEP_TIMEOUT_MILLIS = 3_000; diff --git a/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/backend/javalin/TestUtils.java b/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/backend/javalin/TestUtils.java index 98f7f684..5a3fcc06 100644 --- a/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/backend/javalin/TestUtils.java +++ b/qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/backend/javalin/TestUtils.java @@ -63,7 +63,6 @@ import com.kingsrook.qqq.backend.core.model.metadata.reporting.ReportType; import com.kingsrook.qqq.backend.core.model.metadata.tables.AssociatedScript; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; import com.kingsrook.qqq.backend.core.model.scripts.ScriptsMetaDataProvider; -import com.kingsrook.qqq.backend.core.model.session.QSession; import com.kingsrook.qqq.backend.core.processes.implementations.mock.MockBackendStep; import com.kingsrook.qqq.backend.module.rdbms.jdbc.ConnectionManager; import com.kingsrook.qqq.backend.module.rdbms.jdbc.QueryManager; diff --git a/qqq-middleware-lambda/src/main/java/com/kingsrook/qqq/lambda/QAbstractLambdaHandler.java b/qqq-middleware-lambda/src/main/java/com/kingsrook/qqq/lambda/QAbstractLambdaHandler.java index 61ed6ff9..a264351d 100644 --- a/qqq-middleware-lambda/src/main/java/com/kingsrook/qqq/lambda/QAbstractLambdaHandler.java +++ b/qqq-middleware-lambda/src/main/java/com/kingsrook/qqq/lambda/QAbstractLambdaHandler.java @@ -33,11 +33,10 @@ import com.amazonaws.services.lambda.runtime.RequestStreamHandler; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.exceptions.QUserFacingException; import com.kingsrook.qqq.backend.core.utils.JsonUtils; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.lambda.model.QLambdaRequest; import com.kingsrook.qqq.lambda.model.QLambdaResponse; import org.apache.commons.io.IOUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.core.config.Configurator; import org.json.JSONException; import org.json.JSONObject; @@ -56,7 +55,7 @@ import org.json.JSONObject; *******************************************************************************/ public abstract class QAbstractLambdaHandler implements RequestStreamHandler { - private static Logger LOG; // = LogManager.getLogger(QBasicLambdaHandler.class); + private static QLogger LOG; // = QLogger.getLogger(QBasicLambdaHandler.class); protected Context context; @@ -213,7 +212,7 @@ public abstract class QAbstractLambdaHandler implements RequestStreamHandler { if(LOG == null) { - LOG = LogManager.getLogger(QAbstractLambdaHandler.class); + LOG = QLogger.getLogger(QAbstractLambdaHandler.class); } } diff --git a/qqq-middleware-picocli/src/test/java/com/kingsrook/qqq/frontend/picocli/TestUtils.java b/qqq-middleware-picocli/src/test/java/com/kingsrook/qqq/frontend/picocli/TestUtils.java index 13998c96..3cedb471 100644 --- a/qqq-middleware-picocli/src/test/java/com/kingsrook/qqq/frontend/picocli/TestUtils.java +++ b/qqq-middleware-picocli/src/test/java/com/kingsrook/qqq/frontend/picocli/TestUtils.java @@ -26,20 +26,20 @@ import java.io.InputStream; import java.sql.Connection; import java.util.List; import com.kingsrook.qqq.backend.core.model.metadata.QAuthenticationType; -import com.kingsrook.qqq.backend.core.processes.implementations.mock.MockBackendStep; +import com.kingsrook.qqq.backend.core.model.metadata.QInstance; import com.kingsrook.qqq.backend.core.model.metadata.authentication.QAuthenticationMetaData; 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.QInstance; -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.QFunctionInputMetaData; import com.kingsrook.qqq.backend.core.model.metadata.processes.QFunctionOutputMetaData; import com.kingsrook.qqq.backend.core.model.metadata.processes.QProcessMetaData; import com.kingsrook.qqq.backend.core.model.metadata.processes.QRecordListMetaData; +import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; +import com.kingsrook.qqq.backend.core.processes.implementations.mock.MockBackendStep; import com.kingsrook.qqq.backend.module.rdbms.jdbc.ConnectionManager; import com.kingsrook.qqq.backend.module.rdbms.jdbc.QueryManager; import com.kingsrook.qqq.backend.module.rdbms.model.metadata.RDBMSBackendMetaData; diff --git a/qqq-middleware-slack/src/main/java/com/kingsrook/qqq/slack/QSlackImplementation.java b/qqq-middleware-slack/src/main/java/com/kingsrook/qqq/slack/QSlackImplementation.java index 0b498d82..096a1447 100644 --- a/qqq-middleware-slack/src/main/java/com/kingsrook/qqq/slack/QSlackImplementation.java +++ b/qqq-middleware-slack/src/main/java/com/kingsrook/qqq/slack/QSlackImplementation.java @@ -65,6 +65,7 @@ import com.kingsrook.qqq.backend.core.model.metadata.fields.DisplayFormat; import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; import com.kingsrook.qqq.backend.core.utils.CollectionUtils; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.core.utils.StringUtils; import com.kingsrook.qqq.backend.javalin.QJavalinImplementation; import com.slack.api.Slack; @@ -76,8 +77,6 @@ import io.javalin.http.Context; import org.apache.commons.io.FileUtils; import org.apache.http.NameValuePair; import org.apache.http.client.utils.URLEncodedUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.json.JSONArray; import org.json.JSONObject; import static io.javalin.apibuilder.ApiBuilder.path; @@ -91,7 +90,7 @@ import static io.javalin.apibuilder.ApiBuilder.post; *******************************************************************************/ public class QSlackImplementation { - private static final Logger LOG = LogManager.getLogger(QSlackImplementation.class); + private static final QLogger LOG = QLogger.getLogger(QSlackImplementation.class); static QInstance qInstance; diff --git a/qqq-sample-project/src/main/java/com/kingsrook/sampleapp/SampleJavalinServer.java b/qqq-sample-project/src/main/java/com/kingsrook/sampleapp/SampleJavalinServer.java index 93f987e7..1f5f0543 100644 --- a/qqq-sample-project/src/main/java/com/kingsrook/sampleapp/SampleJavalinServer.java +++ b/qqq-sample-project/src/main/java/com/kingsrook/sampleapp/SampleJavalinServer.java @@ -23,11 +23,10 @@ package com.kingsrook.sampleapp; import com.kingsrook.qqq.backend.core.model.metadata.QInstance; +import com.kingsrook.qqq.backend.core.utils.QLogger; import com.kingsrook.qqq.backend.javalin.QJavalinImplementation; import io.javalin.Javalin; import io.javalin.plugin.bundled.CorsPluginConfig; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; /******************************************************************************* @@ -35,7 +34,7 @@ import org.apache.logging.log4j.Logger; *******************************************************************************/ public class SampleJavalinServer { - private static final Logger LOG = LogManager.getLogger(SampleJavalinServer.class); + private static final QLogger LOG = QLogger.getLogger(SampleJavalinServer.class); private static final int PORT = 8000;