diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/customizers/ChildInserterPostInsertCustomizer.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/customizers/ChildInserterPostInsertCustomizer.java index 84363343..c445fce2 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/customizers/ChildInserterPostInsertCustomizer.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/customizers/ChildInserterPostInsertCustomizer.java @@ -28,6 +28,7 @@ import java.util.Iterator; import java.util.List; import com.kingsrook.qqq.backend.core.actions.tables.InsertAction; import com.kingsrook.qqq.backend.core.actions.tables.UpdateAction; +import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.exceptions.QRuntimeException; import com.kingsrook.qqq.backend.core.model.actions.tables.insert.InsertInput; @@ -97,7 +98,7 @@ public abstract class ChildInserterPostInsertCustomizer extends AbstractPostInse List rs = records; List childrenToInsert = new ArrayList<>(); QTableMetaData table = getInsertInput().getTable(); - QTableMetaData childTable = getInsertInput().getInstance().getTable(getChildTableName()); + QTableMetaData childTable = QContext.getQInstance().getTable(getChildTableName()); //////////////////////////////////////////////////////////////////////////////// // iterate over the inserted records, building a list child records to insert // diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/widgets/AbstractWidgetRenderer.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/widgets/AbstractWidgetRenderer.java index 2bb15cfc..e9cc04f8 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/widgets/AbstractWidgetRenderer.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/widgets/AbstractWidgetRenderer.java @@ -31,6 +31,7 @@ import java.util.Map; import java.util.Set; import com.kingsrook.qqq.backend.core.actions.values.QValueFormatter; import com.kingsrook.qqq.backend.core.actions.values.SearchPossibleValueSourceAction; +import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.model.actions.tables.query.QCriteriaOperator; import com.kingsrook.qqq.backend.core.model.actions.tables.query.QFilterCriteria; @@ -102,7 +103,7 @@ public abstract class AbstractWidgetRenderer String possibleValueSourceName = dropdownData.getPossibleValueSourceName(); if(possibleValueSourceName != null) { - QPossibleValueSource possibleValueSource = input.getInstance().getPossibleValueSource(possibleValueSourceName); + QPossibleValueSource possibleValueSource = QContext.getQInstance().getPossibleValueSource(possibleValueSourceName); ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // this looks complicated, but is just look for a label in the dropdown data and if found use it, // diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/widgets/ChildRecordListRenderer.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/widgets/ChildRecordListRenderer.java index c940b690..a44cb44f 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/widgets/ChildRecordListRenderer.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/widgets/ChildRecordListRenderer.java @@ -34,6 +34,7 @@ import com.kingsrook.qqq.backend.core.actions.tables.CountAction; import com.kingsrook.qqq.backend.core.actions.tables.GetAction; import com.kingsrook.qqq.backend.core.actions.tables.QueryAction; import com.kingsrook.qqq.backend.core.actions.values.QValueFormatter; +import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.exceptions.QNotFoundException; import com.kingsrook.qqq.backend.core.logging.QLogger; @@ -181,10 +182,10 @@ public class ChildRecordListRenderer extends AbstractWidgetRenderer { String widgetLabel = input.getQueryParams().get("widgetLabel"); String joinName = input.getQueryParams().get("joinName"); - QJoinMetaData join = input.getInstance().getJoin(joinName); + QJoinMetaData join = QContext.getQInstance().getJoin(joinName); String id = input.getQueryParams().get("id"); - QTableMetaData leftTable = input.getInstance().getTable(join.getLeftTable()); - QTableMetaData rightTable = input.getInstance().getTable(join.getRightTable()); + QTableMetaData leftTable = QContext.getQInstance().getTable(join.getLeftTable()); + QTableMetaData rightTable = QContext.getQInstance().getTable(join.getRightTable()); Integer maxRows = null; if(StringUtils.hasContent(input.getQueryParams().get("maxRows"))) @@ -252,7 +253,7 @@ public class ChildRecordListRenderer extends AbstractWidgetRenderer } } - String tablePath = input.getInstance().getTablePath(rightTable.getName()); + String tablePath = QContext.getQInstance().getTablePath(rightTable.getName()); String viewAllLink = tablePath == null ? null : (tablePath + "?filter=" + URLEncoder.encode(JsonUtils.toJson(filter), Charset.defaultCharset())); ChildRecordListData widgetData = new ChildRecordListData(widgetLabel, queryOutput, rightTable, tablePath, viewAllLink, totalRows); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/widgets/ProcessWidgetRenderer.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/widgets/ProcessWidgetRenderer.java index bdbf8382..b9665494 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/widgets/ProcessWidgetRenderer.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/widgets/ProcessWidgetRenderer.java @@ -24,6 +24,7 @@ package com.kingsrook.qqq.backend.core.actions.dashboard.widgets; import java.util.HashMap; import com.kingsrook.qqq.backend.core.actions.ActionHelper; +import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.model.actions.widgets.RenderWidgetInput; import com.kingsrook.qqq.backend.core.model.actions.widgets.RenderWidgetOutput; @@ -57,7 +58,7 @@ public class ProcessWidgetRenderer extends AbstractWidgetRenderer setupDropdowns(input, widgetMetaData, data); String processName = (String) widgetMetaData.getDefaultValues().get(WIDGET_PROCESS_NAME); - QProcessMetaData processMetaData = input.getInstance().getProcess(processName); + QProcessMetaData processMetaData = QContext.getQInstance().getProcess(processName); data.setProcessMetaData(processMetaData); data.setDefaultValues(new HashMap<>(input.getQueryParams())); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/metadata/MetaDataAction.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/metadata/MetaDataAction.java index d8bc012e..b1f6b52b 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/metadata/MetaDataAction.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/metadata/MetaDataAction.java @@ -30,6 +30,7 @@ import java.util.Map; import com.kingsrook.qqq.backend.core.actions.ActionHelper; import com.kingsrook.qqq.backend.core.actions.permissions.PermissionCheckResult; import com.kingsrook.qqq.backend.core.actions.permissions.PermissionsHelper; +import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.model.actions.metadata.MetaDataInput; import com.kingsrook.qqq.backend.core.model.actions.metadata.MetaDataOutput; @@ -72,7 +73,7 @@ public class MetaDataAction // map tables to frontend metadata // ///////////////////////////////////// Map tables = new LinkedHashMap<>(); - for(Map.Entry entry : metaDataInput.getInstance().getTables().entrySet()) + for(Map.Entry entry : QContext.getQInstance().getTables().entrySet()) { String tableName = entry.getKey(); QTableMetaData table = entry.getValue(); @@ -83,7 +84,7 @@ public class MetaDataAction continue; } - QBackendMetaData backendForTable = metaDataInput.getInstance().getBackendForTable(tableName); + QBackendMetaData backendForTable = QContext.getQInstance().getBackendForTable(tableName); tables.put(tableName, new QFrontendTableMetaData(metaDataInput, backendForTable, table, false, false)); treeNodes.put(tableName, new AppTreeNode(table)); } @@ -96,7 +97,7 @@ public class MetaDataAction // map processes to frontend metadata // //////////////////////////////////////// Map processes = new LinkedHashMap<>(); - for(Map.Entry entry : metaDataInput.getInstance().getProcesses().entrySet()) + for(Map.Entry entry : QContext.getQInstance().getProcesses().entrySet()) { String processName = entry.getKey(); QProcessMetaData process = entry.getValue(); @@ -116,7 +117,7 @@ public class MetaDataAction // map reports to frontend metadata // ////////////////////////////////////// Map reports = new LinkedHashMap<>(); - for(Map.Entry entry : metaDataInput.getInstance().getReports().entrySet()) + for(Map.Entry entry : QContext.getQInstance().getReports().entrySet()) { String reportName = entry.getKey(); QReportMetaData report = entry.getValue(); @@ -136,7 +137,7 @@ public class MetaDataAction // map widgets to frontend metadata // ////////////////////////////////////// Map widgets = new LinkedHashMap<>(); - for(Map.Entry entry : metaDataInput.getInstance().getWidgets().entrySet()) + for(Map.Entry entry : QContext.getQInstance().getWidgets().entrySet()) { String widgetName = entry.getKey(); QWidgetMetaDataInterface widget = entry.getValue(); @@ -154,7 +155,7 @@ public class MetaDataAction /////////////////////////////////////////////////////// // sort apps - by sortOrder (integer), then by label // /////////////////////////////////////////////////////// - List sortedApps = metaDataInput.getInstance().getApps().values().stream() + List sortedApps = QContext.getQInstance().getApps().values().stream() .sorted(Comparator.comparing((QAppMetaData a) -> a.getSortOrder()) .thenComparing((QAppMetaData a) -> a.getLabel())) .toList(); @@ -211,14 +212,14 @@ public class MetaDataAction //////////////////////////////////// // add branding metadata if found // //////////////////////////////////// - if(metaDataInput.getInstance().getBranding() != null) + if(QContext.getQInstance().getBranding() != null) { - metaDataOutput.setBranding(metaDataInput.getInstance().getBranding()); + metaDataOutput.setBranding(QContext.getQInstance().getBranding()); } - metaDataOutput.setEnvironmentValues(metaDataInput.getInstance().getEnvironmentValues()); + metaDataOutput.setEnvironmentValues(QContext.getQInstance().getEnvironmentValues()); - metaDataOutput.setHelpContents(metaDataInput.getInstance().getHelpContent()); + metaDataOutput.setHelpContents(QContext.getQInstance().getHelpContent()); // todo post-customization - can do whatever w/ the result if you want? diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/metadata/ProcessMetaDataAction.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/metadata/ProcessMetaDataAction.java index a6419699..1044a500 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/metadata/ProcessMetaDataAction.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/metadata/ProcessMetaDataAction.java @@ -23,6 +23,7 @@ package com.kingsrook.qqq.backend.core.actions.metadata; import com.kingsrook.qqq.backend.core.actions.ActionHelper; +import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.exceptions.QNotFoundException; import com.kingsrook.qqq.backend.core.model.actions.metadata.ProcessMetaDataInput; @@ -47,7 +48,7 @@ public class ProcessMetaDataAction // todo pre-customization - just get to modify the request? ProcessMetaDataOutput processMetaDataOutput = new ProcessMetaDataOutput(); - QProcessMetaData process = processMetaDataInput.getInstance().getProcess(processMetaDataInput.getProcessName()); + QProcessMetaData process = QContext.getQInstance().getProcess(processMetaDataInput.getProcessName()); if(process == null) { throw (new QNotFoundException("Process [" + processMetaDataInput.getProcessName() + "] was not found.")); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/metadata/TableMetaDataAction.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/metadata/TableMetaDataAction.java index 46c4f243..e5b2daf4 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/metadata/TableMetaDataAction.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/metadata/TableMetaDataAction.java @@ -23,6 +23,7 @@ package com.kingsrook.qqq.backend.core.actions.metadata; import com.kingsrook.qqq.backend.core.actions.ActionHelper; +import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.exceptions.QNotFoundException; import com.kingsrook.qqq.backend.core.model.actions.metadata.TableMetaDataInput; @@ -48,12 +49,12 @@ public class TableMetaDataAction // todo pre-customization - just get to modify the request? TableMetaDataOutput tableMetaDataOutput = new TableMetaDataOutput(); - QTableMetaData table = tableMetaDataInput.getInstance().getTable(tableMetaDataInput.getTableName()); + QTableMetaData table = QContext.getQInstance().getTable(tableMetaDataInput.getTableName()); if(table == null) { throw (new QNotFoundException("Table [" + tableMetaDataInput.getTableName() + "] was not found.")); } - QBackendMetaData backendForTable = tableMetaDataInput.getInstance().getBackendForTable(table.getName()); + QBackendMetaData backendForTable = QContext.getQInstance().getBackendForTable(table.getName()); tableMetaDataOutput.setTable(new QFrontendTableMetaData(tableMetaDataInput, backendForTable, table, true, true)); // todo post-customization - can do whatever w/ the result if you want diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/processes/CancelProcessAction.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/processes/CancelProcessAction.java index 1e70f88c..568b98d3 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/processes/CancelProcessAction.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/processes/CancelProcessAction.java @@ -25,6 +25,7 @@ package com.kingsrook.qqq.backend.core.actions.processes; import java.util.Optional; import java.util.UUID; import com.kingsrook.qqq.backend.core.actions.ActionHelper; +import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.exceptions.QBadRequestException; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.logging.QLogger; @@ -54,7 +55,7 @@ public class CancelProcessAction extends RunProcessAction { ActionHelper.validateSession(runProcessInput); - QProcessMetaData process = runProcessInput.getInstance().getProcess(runProcessInput.getProcessName()); + QProcessMetaData process = QContext.getQInstance().getProcess(runProcessInput.getProcessName()); if(process == null) { throw new QBadRequestException("Process [" + runProcessInput.getProcessName() + "] is not defined in this instance."); 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 8b0d7dd3..6f97ec1a 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 @@ -30,6 +30,7 @@ import java.util.Objects; import java.util.stream.Collectors; import com.kingsrook.qqq.backend.core.actions.ActionHelper; import com.kingsrook.qqq.backend.core.actions.tables.QueryAction; +import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.exceptions.QUserFacingException; import com.kingsrook.qqq.backend.core.logging.QLogger; @@ -64,7 +65,7 @@ public class RunBackendStepAction { ActionHelper.validateSession(runBackendStepInput); - QProcessMetaData process = runBackendStepInput.getInstance().getProcess(runBackendStepInput.getProcessName()); + QProcessMetaData process = QContext.getQInstance().getProcess(runBackendStepInput.getProcessName()); if(process == null) { throw new QException("Process [" + runBackendStepInput.getProcessName() + "] is not defined in this instance."); 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 8624b926..03ee26aa 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 @@ -99,7 +99,7 @@ public class RunProcessAction { ActionHelper.validateSession(runProcessInput); - QProcessMetaData process = runProcessInput.getInstance().getProcess(runProcessInput.getProcessName()); + QProcessMetaData process = QContext.getQInstance().getProcess(runProcessInput.getProcessName()); if(process == null) { throw new QException("Process [" + runProcessInput.getProcessName() + "] is not defined in this instance."); 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 a216e9e5..938ec120 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 @@ -443,7 +443,13 @@ public class GenerateReportAction extends AbstractQActionFunction>>>>>> a9eb8946 (Remove all calls to actionInput.getInstance and getSesssion, in favor of the equivallent methods from QContext) if(dataSource.getQueryInputCustomizer() != null) { @@ -800,6 +806,7 @@ public class GenerateReportAction extends AbstractQActionFunction reportViews = views.stream().filter(v -> v.getType().equals(ReportType.SUMMARY)).toList(); for(QReportView view : reportViews) { +<<<<<<< HEAD QReportDataSource dataSource = getDataSource(view.getDataSourceName()); if(dataSource == null) { @@ -808,6 +815,15 @@ public class GenerateReportAction extends AbstractQActionFunction>>>>>> a9eb8946 (Remove all calls to actionInput.getInstance and getSesssion, in favor of the equivallent methods from QContext) ExportInput exportInput = new ExportInput(); exportInput.setReportDestination(reportInput.getReportDestination()); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/excel/fastexcel/ExcelFastexcelExportStreamer.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/excel/fastexcel/ExcelFastexcelExportStreamer.java index fd1dc915..92319cd1 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/excel/fastexcel/ExcelFastexcelExportStreamer.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/excel/fastexcel/ExcelFastexcelExportStreamer.java @@ -124,7 +124,7 @@ public class ExcelFastexcelExportStreamer implements ExportStreamerInterface if(workbook == null) { String appName = ObjectUtils.tryAndRequireNonNullElse(() -> QContext.getQInstance().getBranding().getAppName(), "QQQ"); - QInstance instance = exportInput.getInstance(); + QInstance instance = QContext.getQInstance(); if(instance != null && instance.getBranding() != null && instance.getBranding().getCompanyName() != null) { appName = instance.getBranding().getCompanyName(); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/GetAction.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/GetAction.java index 7fc8bec8..24c6e983 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/GetAction.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/GetAction.java @@ -352,7 +352,7 @@ public class GetAction { if(qPossibleValueTranslator == null) { - qPossibleValueTranslator = new QPossibleValueTranslator(getInput.getInstance(), getInput.getSession()); + qPossibleValueTranslator = new QPossibleValueTranslator(QContext.getQInstance(), QContext.getQSession()); } qPossibleValueTranslator.translatePossibleValuesInRecords(getInput.getTable(), List.of(returnRecord)); } 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 9773d3f0..6ece199a 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 @@ -241,7 +241,7 @@ public class InsertAction extends AbstractQActionFunction outputRecordMap = runBackendStepOutput.getRecords().stream().collect(Collectors.toMap(r -> r.getValue(primaryKeyFieldName), r -> r, (a, b) -> a)); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/delete/BulkDeleteTransformStep.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/delete/BulkDeleteTransformStep.java index c0357f66..747877d9 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/delete/BulkDeleteTransformStep.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/delete/BulkDeleteTransformStep.java @@ -27,6 +27,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; import com.kingsrook.qqq.backend.core.actions.tables.DeleteAction; +import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.model.actions.processes.ProcessSummaryLine; import com.kingsrook.qqq.backend.core.model.actions.processes.ProcessSummaryLineInterface; @@ -65,7 +66,7 @@ public class BulkDeleteTransformStep extends AbstractTransformStep /////////////////////////////////////////////////////// // capture the table label - for the process summary // /////////////////////////////////////////////////////// - QTableMetaData table = runBackendStepInput.getInstance().getTable(runBackendStepInput.getTableName()); + QTableMetaData table = QContext.getQInstance().getTable(runBackendStepInput.getTableName()); if(table != null) { tableLabel = table.getLabel(); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/edit/BulkEditLoadStep.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/edit/BulkEditLoadStep.java index e35181eb..72eaa3fb 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/edit/BulkEditLoadStep.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/edit/BulkEditLoadStep.java @@ -25,6 +25,7 @@ package com.kingsrook.qqq.backend.core.processes.implementations.bulk.edit; import java.io.Serializable; import java.util.ArrayList; import java.util.List; +import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.model.actions.processes.ProcessSummaryLine; import com.kingsrook.qqq.backend.core.model.actions.processes.ProcessSummaryLineInterface; @@ -99,7 +100,7 @@ public class BulkEditLoadStep extends LoadViaUpdateStep implements ProcessSummar { super.preRun(runBackendStepInput, runBackendStepOutput); - QTableMetaData table = runBackendStepInput.getInstance().getTable(runBackendStepInput.getTableName()); + QTableMetaData table = QContext.getQInstance().getTable(runBackendStepInput.getTableName()); if(table != null) { tableLabel = table.getLabel(); @@ -124,7 +125,7 @@ public class BulkEditLoadStep extends LoadViaUpdateStep implements ProcessSummar //////////////////////////////////////////////////////// // roll up results based on output from update action // //////////////////////////////////////////////////////// - QTableMetaData table = runBackendStepInput.getInstance().getTable(runBackendStepInput.getTableName()); + QTableMetaData table = QContext.getQInstance().getTable(runBackendStepInput.getTableName()); for(QRecord record : runBackendStepOutput.getRecords()) { Serializable recordPrimaryKey = record.getValue(table.getPrimaryKeyField()); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/edit/BulkEditTransformStep.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/edit/BulkEditTransformStep.java index 624d6a04..10d10bf1 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/edit/BulkEditTransformStep.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/edit/BulkEditTransformStep.java @@ -31,6 +31,7 @@ import java.util.Optional; import com.kingsrook.qqq.backend.core.actions.tables.UpdateAction; import com.kingsrook.qqq.backend.core.actions.values.QPossibleValueTranslator; import com.kingsrook.qqq.backend.core.actions.values.QValueFormatter; +import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.model.actions.processes.ProcessSummaryLine; import com.kingsrook.qqq.backend.core.model.actions.processes.ProcessSummaryLineInterface; @@ -81,7 +82,7 @@ public class BulkEditTransformStep extends AbstractTransformStep /////////////////////////////////////////////////////// // capture the table label - for the process summary // /////////////////////////////////////////////////////// - table = runBackendStepInput.getInstance().getTable(runBackendStepInput.getTableName()); + table = QContext.getQInstance().getTable(runBackendStepInput.getTableName()); if(table != null) { tableLabel = table.getLabel(); @@ -230,7 +231,7 @@ public class BulkEditTransformStep extends AbstractTransformStep if(field.getPossibleValueSourceName() != null) { - QPossibleValueTranslator qPossibleValueTranslator = new QPossibleValueTranslator(runBackendStepInput.getInstance(), runBackendStepInput.getSession()); + QPossibleValueTranslator qPossibleValueTranslator = new QPossibleValueTranslator(QContext.getQInstance(), QContext.getQSession()); String translatedValue = qPossibleValueTranslator.translatePossibleValue(field, value); if(StringUtils.hasContent(translatedValue)) { diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/insert/BulkInsertExtractStep.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/insert/BulkInsertExtractStep.java index 3a83c955..c29d1648 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/insert/BulkInsertExtractStep.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/insert/BulkInsertExtractStep.java @@ -27,6 +27,7 @@ import java.util.Locale; import java.util.Map; import java.util.Optional; import com.kingsrook.qqq.backend.core.adapters.CsvToQRecordAdapter; +import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.exceptions.QUserFacingException; import com.kingsrook.qqq.backend.core.model.actions.processes.QUploadedFile; @@ -83,7 +84,7 @@ public class BulkInsertExtractStep extends AbstractExtractStep .withLimit(getLimit()) .withCsv(new String(bytes)) .withDoCorrectValueTypes(true) - .withTable(runBackendStepInput.getInstance().getTable(tableName)) + .withTable(QContext.getQInstance().getTable(tableName)) .withMapping(mapping) .withRecordCustomizer((record) -> { diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/insert/BulkInsertTransformStep.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/insert/BulkInsertTransformStep.java index 2546df14..f4eff9a3 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/insert/BulkInsertTransformStep.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/bulk/insert/BulkInsertTransformStep.java @@ -38,6 +38,7 @@ import com.kingsrook.qqq.backend.core.actions.customizers.TableCustomizerInterfa import com.kingsrook.qqq.backend.core.actions.customizers.TableCustomizers; import com.kingsrook.qqq.backend.core.actions.tables.InsertAction; import com.kingsrook.qqq.backend.core.actions.tables.helpers.UniqueKeyHelper; +import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.model.actions.processes.ProcessSummaryLine; import com.kingsrook.qqq.backend.core.model.actions.processes.ProcessSummaryLineInterface; @@ -104,7 +105,7 @@ public class BulkInsertTransformStep extends AbstractTransformStep @Override public void preRun(RunBackendStepInput runBackendStepInput, RunBackendStepOutput runBackendStepOutput) throws QException { - this.table = runBackendStepInput.getInstance().getTable(runBackendStepInput.getTableName()); + this.table = QContext.getQInstance().getTable(runBackendStepInput.getTableName()); ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // since we're doing a unique key check in this class, we can tell the loadViaInsert step that it (rather, the InsertAction) doesn't need to re-do one. // @@ -121,7 +122,7 @@ public class BulkInsertTransformStep extends AbstractTransformStep public void runOnePage(RunBackendStepInput runBackendStepInput, RunBackendStepOutput runBackendStepOutput) throws QException { int rowsInThisPage = runBackendStepInput.getRecords().size(); - QTableMetaData table = runBackendStepInput.getInstance().getTable(runBackendStepInput.getTableName()); + QTableMetaData table = QContext.getQInstance().getTable(runBackendStepInput.getTableName()); ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // set up an insert-input, which will be used as input to the pre-customizer as well as for additional validations // 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 07df9c24..d077488c 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 @@ -28,6 +28,7 @@ import java.util.ArrayList; import java.util.List; import com.kingsrook.qqq.backend.core.actions.processes.BackendStep; import com.kingsrook.qqq.backend.core.adapters.JsonToQFieldMappingAdapter; +import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.logging.QLogger; import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepInput; @@ -85,7 +86,7 @@ public class BasicETLTransformFunction implements BackendStep throw (new QException("Mapping was not a Key-based mapping type. Was a : " + mapping.getClass().getName())); } - QTableMetaData table = runBackendStepInput.getInstance().getTable(tableName); + QTableMetaData table = QContext.getQInstance().getTable(tableName); List mappedRecords = applyMapping(runBackendStepInput.getRecords(), table, keyBasedFieldMapping); ////////////////////////////////////////////////////////////////////////////////////////////////////// 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 51dd30fe..728d78f3 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 @@ -27,6 +27,7 @@ import java.util.List; import com.kingsrook.qqq.backend.core.actions.customizers.QCodeLoader; import com.kingsrook.qqq.backend.core.actions.values.QPossibleValueTranslator; import com.kingsrook.qqq.backend.core.actions.values.QValueFormatter; +import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.logging.QLogger; import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepInput; import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepOutput; @@ -85,14 +86,14 @@ public class BaseStreamedETLStep protected void updateRecordsWithDisplayValuesAndPossibleValues(RunBackendStepInput input, List list) { String destinationTable = input.getValueString(StreamedETLWithFrontendProcess.FIELD_DESTINATION_TABLE); - QTableMetaData table = input.getInstance().getTable(destinationTable); + QTableMetaData table = QContext.getQInstance().getTable(destinationTable); if(table != null && list != null) { QValueFormatter qValueFormatter = new QValueFormatter(); qValueFormatter.setDisplayValuesInRecords(table, list); - QPossibleValueTranslator qPossibleValueTranslator = new QPossibleValueTranslator(input.getInstance(), input.getSession()); + QPossibleValueTranslator qPossibleValueTranslator = new QPossibleValueTranslator(QContext.getQInstance(), QContext.getQSession()); qPossibleValueTranslator.translatePossibleValuesInRecords(table, list); } } diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/streamedwithfrontend/ExtractViaQueryStep.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/streamedwithfrontend/ExtractViaQueryStep.java index 777d3f72..7269b75d 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/streamedwithfrontend/ExtractViaQueryStep.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/streamedwithfrontend/ExtractViaQueryStep.java @@ -34,6 +34,7 @@ import com.kingsrook.qqq.backend.core.actions.reporting.DistinctFilteringRecordP import com.kingsrook.qqq.backend.core.actions.reporting.RecordPipe; import com.kingsrook.qqq.backend.core.actions.tables.CountAction; import com.kingsrook.qqq.backend.core.actions.tables.QueryAction; +import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.logging.QLogger; import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepInput; @@ -267,7 +268,7 @@ public class ExtractViaQueryStep extends AbstractExtractStep ////////////////////////////////////////////////////////////////////// // else, check for recordIds from a frontend launching of a process // ////////////////////////////////////////////////////////////////////// - QTableMetaData table = runBackendStepInput.getInstance().getTable(runBackendStepInput.getValueString(FIELD_SOURCE_TABLE)); + QTableMetaData table = QContext.getQInstance().getTable(runBackendStepInput.getValueString(FIELD_SOURCE_TABLE)); if(table == null) { throw (new QException("source table name was not set - could not load records by id")); @@ -319,7 +320,7 @@ public class ExtractViaQueryStep extends AbstractExtractStep if(needDistinctPipe) { String sourceTableName = runBackendStepInput.getValueString(StreamedETLWithFrontendProcess.FIELD_SOURCE_TABLE); - QTableMetaData sourceTable = runBackendStepInput.getInstance().getTable(sourceTableName); + QTableMetaData sourceTable = QContext.getQInstance().getTable(sourceTableName); return (new DistinctFilteringRecordPipe(new UniqueKey(sourceTable.getPrimaryKeyField()), overrideCapacity)); } else diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/streamedwithfrontend/LoadViaInsertOrUpdateStep.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/streamedwithfrontend/LoadViaInsertOrUpdateStep.java index 7244c07a..fbe4d694 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/streamedwithfrontend/LoadViaInsertOrUpdateStep.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/etl/streamedwithfrontend/LoadViaInsertOrUpdateStep.java @@ -28,6 +28,7 @@ import java.util.Optional; import com.kingsrook.qqq.backend.core.actions.QBackendTransaction; import com.kingsrook.qqq.backend.core.actions.tables.InsertAction; import com.kingsrook.qqq.backend.core.actions.tables.UpdateAction; +import com.kingsrook.qqq.backend.core.context.QContext; 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; @@ -86,7 +87,7 @@ public class LoadViaInsertOrUpdateStep extends AbstractLoadStep *******************************************************************************/ public void insertAndUpdateRecords(RunBackendStepInput runBackendStepInput, RunBackendStepOutput runBackendStepOutput) throws QException { - QTableMetaData tableMetaData = runBackendStepInput.getInstance().getTable(runBackendStepInput.getValueString(FIELD_DESTINATION_TABLE)); + QTableMetaData tableMetaData = QContext.getQInstance().getTable(runBackendStepInput.getValueString(FIELD_DESTINATION_TABLE)); if(CollectionUtils.nullSafeHasContents(recordsToInsert)) { @@ -139,7 +140,7 @@ public class LoadViaInsertOrUpdateStep extends AbstractLoadStep *******************************************************************************/ protected void evaluateRecords(RunBackendStepInput runBackendStepInput) throws QException { - QTableMetaData tableMetaData = runBackendStepInput.getInstance().getTable(runBackendStepInput.getValueString(FIELD_DESTINATION_TABLE)); + QTableMetaData tableMetaData = QContext.getQInstance().getTable(runBackendStepInput.getValueString(FIELD_DESTINATION_TABLE)); recordsToInsert = new ArrayList<>(); recordsToUpdate = new ArrayList<>(); 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 04308698..1111a705 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 @@ -162,10 +162,10 @@ public class StreamedETLPreviewStep extends BaseStreamedETLStep implements Backe private void countRecords(RunBackendStepInput runBackendStepInput, RunBackendStepOutput runBackendStepOutput, AbstractExtractStep extractStep) throws QException { String sourceTableName = runBackendStepInput.getValueString(StreamedETLWithFrontendProcess.FIELD_SOURCE_TABLE); - QTableMetaData sourceTable = runBackendStepInput.getInstance().getTable(sourceTableName); + QTableMetaData sourceTable = QContext.getQInstance().getTable(sourceTableName); if(StringUtils.hasContent(sourceTableName)) { - QBackendMetaData sourceTableBackend = runBackendStepInput.getInstance().getBackendForTable(sourceTableName); + QBackendMetaData sourceTableBackend = QContext.getQInstance().getBackendForTable(sourceTableName); if(sourceTable.isCapabilityEnabled(sourceTableBackend, Capability.TABLE_COUNT)) { Integer recordCount = extractStep.doCount(runBackendStepInput); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/reports/ExecuteReportStep.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/reports/ExecuteReportStep.java index fdfa381c..57a87470 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/reports/ExecuteReportStep.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/reports/ExecuteReportStep.java @@ -31,6 +31,7 @@ import java.time.format.DateTimeFormatter; import java.util.Map; import com.kingsrook.qqq.backend.core.actions.processes.BackendStep; import com.kingsrook.qqq.backend.core.actions.reporting.GenerateReportAction; +import com.kingsrook.qqq.backend.core.context.QContext; 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; @@ -58,7 +59,7 @@ public class ExecuteReportStep implements BackendStep try { String reportName = runBackendStepInput.getValueString("reportName"); - QReportMetaData report = runBackendStepInput.getInstance().getReport(reportName); + QReportMetaData report = QContext.getQInstance().getReport(reportName); File tmpFile = File.createTempFile(reportName, ".xlsx", new File("/tmp/")); runBackendStepInput.getAsyncJobCallback().updateStatus("Generating Report"); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/reports/PrepareReportForRecordStep.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/reports/PrepareReportForRecordStep.java index d97bc159..7b550ada 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/reports/PrepareReportForRecordStep.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/reports/PrepareReportForRecordStep.java @@ -26,6 +26,7 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.Iterator; import com.kingsrook.qqq.backend.core.actions.tables.GetAction; +import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.exceptions.QUserFacingException; import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepInput; @@ -106,7 +107,7 @@ public class PrepareReportForRecordStep extends PrepareReportStep } String reportName = runBackendStepInput.getValueString("reportName"); - QReportMetaData report = runBackendStepInput.getInstance().getReport(reportName); + QReportMetaData report = QContext.getQInstance().getReport(reportName); // runBackendStepOutput.addValue("downloadFileBaseName", runBackendStepInput.getTable().getLabel() + " " + record.getRecordLabel()); runBackendStepOutput.addValue("downloadFileBaseName", report.getLabel() + " - " + record.getRecordLabel()); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/reports/PrepareReportStep.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/reports/PrepareReportStep.java index 47c056b4..c78bf3fd 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/reports/PrepareReportStep.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/reports/PrepareReportStep.java @@ -25,6 +25,7 @@ package com.kingsrook.qqq.backend.core.processes.implementations.reports; import java.util.ArrayList; import java.util.List; import com.kingsrook.qqq.backend.core.actions.processes.BackendStep; +import com.kingsrook.qqq.backend.core.context.QContext; 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; @@ -56,7 +57,7 @@ public class PrepareReportStep implements BackendStep throw (new QException("Process value [reportName] was not given.")); } - QReportMetaData report = runBackendStepInput.getInstance().getReport(reportName); + QReportMetaData report = QContext.getQInstance().getReport(reportName); if(report == null) { throw (new QException("Process named [" + reportName + "] was not found in this instance.")); diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/scripts/StoreScriptRevisionProcessStep.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/scripts/StoreScriptRevisionProcessStep.java index 70129eec..96a2e43f 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/scripts/StoreScriptRevisionProcessStep.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/scripts/StoreScriptRevisionProcessStep.java @@ -145,7 +145,7 @@ public class StoreScriptRevisionProcessStep implements BackendStep try { - scriptRevision.setValue("author", input.getSession().getUser().getFullName()); + scriptRevision.setValue("author", QContext.getQSession().getUser().getFullName()); } catch(Exception e) { diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/tablesync/AbstractTableSyncTransformStep.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/tablesync/AbstractTableSyncTransformStep.java index 37652098..68619a28 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/tablesync/AbstractTableSyncTransformStep.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/implementations/tablesync/AbstractTableSyncTransformStep.java @@ -365,10 +365,10 @@ public abstract class AbstractTableSyncTransformStep extends AbstractTransformSt { if(possibleValueTranslator == null) { - possibleValueTranslator = new QPossibleValueTranslator(runBackendStepInput.getInstance(), runBackendStepInput.getSession()); + possibleValueTranslator = new QPossibleValueTranslator(QContext.getQInstance(), QContext.getQSession()); } - possibleValueTranslator.translatePossibleValuesInRecords(runBackendStepInput.getInstance().getTable(destinationTableName), runBackendStepOutput.getRecords()); + possibleValueTranslator.translatePossibleValuesInRecords(QContext.getQInstance().getTable(destinationTableName), runBackendStepOutput.getRecords()); } } } diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/utils/GeneralProcessUtils.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/utils/GeneralProcessUtils.java index a3e81f44..cba7ac24 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/utils/GeneralProcessUtils.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/processes/utils/GeneralProcessUtils.java @@ -32,6 +32,7 @@ import java.util.function.Consumer; import com.kingsrook.qqq.backend.core.actions.tables.CountAction; import com.kingsrook.qqq.backend.core.actions.tables.GetAction; import com.kingsrook.qqq.backend.core.actions.tables.QueryAction; +import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.exceptions.QUserFacingException; import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepInput; @@ -515,7 +516,7 @@ public class GeneralProcessUtils *******************************************************************************/ public static Integer validateSingleSelectedId(RunBackendStepInput runBackendStepInput, String tableName) throws QException { - String tableLabel = runBackendStepInput.getInstance().getTable(tableName).getLabel(); + String tableLabel = QContext.getQInstance().getTable(tableName).getLabel(); //////////////////////////////////////////////////// // Get the selected recordId and verify we only 1 // diff --git a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/actions/automation/polling/StandardScheduledExecutorTest.java b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/actions/automation/polling/StandardScheduledExecutorTest.java index e08b4ac1..84ed8ae9 100644 --- a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/actions/automation/polling/StandardScheduledExecutorTest.java +++ b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/actions/automation/polling/StandardScheduledExecutorTest.java @@ -174,7 +174,7 @@ class StandardScheduledExecutorTest extends BaseTest @Override public void execute(RecordAutomationInput recordAutomationInput) throws QException { - sessionId = recordAutomationInput.getSession().getIdReference(); + sessionId = QContext.getQSession().getIdReference(); } } diff --git a/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/AbstractAPIAction.java b/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/AbstractAPIAction.java index 284a71f1..8425fbfb 100644 --- a/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/AbstractAPIAction.java +++ b/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/AbstractAPIAction.java @@ -23,6 +23,7 @@ package com.kingsrook.qqq.backend.module.api.actions; import com.kingsrook.qqq.backend.core.actions.customizers.QCodeLoader; +import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.model.actions.AbstractTableActionInput; import com.kingsrook.qqq.backend.core.model.metadata.QBackendMetaData; import com.kingsrook.qqq.backend.core.model.session.QSession; @@ -45,9 +46,9 @@ public abstract class AbstractAPIAction *******************************************************************************/ public void preAction(AbstractTableActionInput actionInput) { - QBackendMetaData baseBackendMetaData = actionInput.getInstance().getBackendForTable(actionInput.getTableName()); + QBackendMetaData baseBackendMetaData = QContext.getQInstance().getBackendForTable(actionInput.getTableName()); this.backendMetaData = (APIBackendMetaData) baseBackendMetaData; - this.session = actionInput.getSession(); + this.session = QContext.getQSession(); if(backendMetaData.getActionUtil() != null) { 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 c047d8bb..0762dd75 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 @@ -24,6 +24,7 @@ package com.kingsrook.qqq.backend.module.filesystem.processes.implementations.et import java.io.File; import com.kingsrook.qqq.backend.core.actions.processes.BackendStep; +import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.logging.QLogger; import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepInput; @@ -68,8 +69,8 @@ public class BasicETLCleanupSourceFilesStep implements BackendStep public void run(RunBackendStepInput runBackendStepInput, RunBackendStepOutput runBackendStepOutput) throws QException { String sourceTableName = runBackendStepInput.getValueString(BasicETLProcess.FIELD_SOURCE_TABLE); - QTableMetaData table = runBackendStepInput.getInstance().getTable(sourceTableName); - QBackendMetaData backend = runBackendStepInput.getInstance().getBackendForTable(sourceTableName); + QTableMetaData table = QContext.getQInstance().getTable(sourceTableName); + QBackendMetaData backend = QContext.getQInstance().getBackendForTable(sourceTableName); QBackendModuleInterface module = new QBackendModuleDispatcher().getQBackendModule(backend); if(!(module instanceof FilesystemBackendModuleInterface filesystemModule)) @@ -93,7 +94,7 @@ public class BasicETLCleanupSourceFilesStep implements BackendStep if(VALUE_DELETE.equals(moveOrDelete)) { LOG.info("Deleting ETL source file: " + sourceFile); - actionBase.deleteFile(runBackendStepInput.getInstance(), table, sourceFile); + actionBase.deleteFile(QContext.getQInstance(), table, sourceFile); } else if(VALUE_MOVE.equals(moveOrDelete)) { @@ -105,7 +106,7 @@ public class BasicETLCleanupSourceFilesStep implements BackendStep } String filePathWithoutBase = actionBase.stripBackendAndTableBasePathsFromFileName(sourceFile, backend, table); String destinationPath = destinationForMoves + File.separator + filePathWithoutBase; - actionBase.moveFile(runBackendStepInput.getInstance(), table, sourceFile, destinationPath); + actionBase.moveFile(QContext.getQInstance(), table, sourceFile, destinationPath); } else { diff --git a/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/filesystem/importer/FilesystemImporterStep.java b/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/filesystem/importer/FilesystemImporterStep.java index a57f9c1e..43867e99 100644 --- a/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/filesystem/importer/FilesystemImporterStep.java +++ b/qqq-backend-module-filesystem/src/main/java/com/kingsrook/qqq/backend/module/filesystem/processes/implementations/filesystem/importer/FilesystemImporterStep.java @@ -127,8 +127,8 @@ public class FilesystemImporterStep implements BackendStep Boolean updateFileIfNameExists = runBackendStepInput.getValueBoolean(FIELD_UPDATE_FILE_IF_NAME_EXISTS); Boolean archiveFileEnabled = runBackendStepInput.getValueBoolean(FIELD_ARCHIVE_FILE_ENABLED); - QTableMetaData sourceTable = runBackendStepInput.getInstance().getTable(runBackendStepInput.getValueString(FIELD_SOURCE_TABLE)); - QTableMetaData importFileTable = runBackendStepInput.getInstance().getTable(runBackendStepInput.getValueString(FIELD_IMPORT_FILE_TABLE)); + QTableMetaData sourceTable = QContext.getQInstance().getTable(runBackendStepInput.getValueString(FIELD_SOURCE_TABLE)); + QTableMetaData importFileTable = QContext.getQInstance().getTable(runBackendStepInput.getValueString(FIELD_IMPORT_FILE_TABLE)); String missingFieldErrorPrefix = "Process " + runBackendStepInput.getProcessName() + " was misconfigured - missing value in field: "; Objects.requireNonNull(fileFormat, missingFieldErrorPrefix + FIELD_FILE_FORMAT); @@ -137,7 +137,7 @@ public class FilesystemImporterStep implements BackendStep // list files in the backend system // // todo - can we do this using query action, with this being a "ONE" type table? // /////////////////////////////////////////////////////////////////////////////////// - QBackendMetaData sourceBackend = runBackendStepInput.getInstance().getBackendForTable(sourceTable.getName()); + QBackendMetaData sourceBackend = QContext.getQInstance().getBackendForTable(sourceTable.getName()); FilesystemBackendModuleInterface sourceModule = (FilesystemBackendModuleInterface) new QBackendModuleDispatcher().getQBackendModule(sourceBackend); AbstractBaseFilesystemAction sourceActionBase = sourceModule.getActionBase(); sourceActionBase.preAction(sourceBackend); @@ -340,7 +340,7 @@ public class FilesystemImporterStep implements BackendStep QTableMetaData archiveTable; try { - archiveTable = runBackendStepInput.getInstance().getTable(archiveTableName); + archiveTable = QContext.getQInstance().getTable(archiveTableName); } catch(Exception e) { @@ -349,7 +349,7 @@ public class FilesystemImporterStep implements BackendStep String archivePath = Objects.requireNonNullElse(runBackendStepInput.getValueString(FIELD_ARCHIVE_PATH), ""); - QBackendMetaData archiveBackend = runBackendStepInput.getInstance().getBackendForTable(archiveTable.getName()); + QBackendMetaData archiveBackend = QContext.getQInstance().getBackendForTable(archiveTable.getName()); FilesystemBackendModuleInterface archiveModule = (FilesystemBackendModuleInterface) new QBackendModuleDispatcher().getQBackendModule(archiveBackend); AbstractBaseFilesystemAction archiveActionBase = archiveModule.getActionBase(); archiveActionBase.preAction(archiveBackend); 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 2796a37e..80c93181 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 @@ -29,6 +29,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import com.kingsrook.qqq.backend.core.actions.processes.BackendStep; +import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.logging.QLogger; import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepInput; @@ -74,23 +75,23 @@ public class FilesystemSyncStep implements BackendStep *******************************************************************************/ private void doRun(RunBackendStepInput runBackendStepInput, RunBackendStepOutput runBackendStepOutput) throws QException { - QTableMetaData sourceTable = runBackendStepInput.getInstance().getTable(runBackendStepInput.getValueString(FilesystemSyncProcess.FIELD_SOURCE_TABLE)); - QTableMetaData archiveTable = runBackendStepInput.getInstance().getTable(runBackendStepInput.getValueString(FilesystemSyncProcess.FIELD_ARCHIVE_TABLE)); - QTableMetaData processingTable = runBackendStepInput.getInstance().getTable(runBackendStepInput.getValueString(FilesystemSyncProcess.FIELD_PROCESSING_TABLE)); + QTableMetaData sourceTable = QContext.getQInstance().getTable(runBackendStepInput.getValueString(FilesystemSyncProcess.FIELD_SOURCE_TABLE)); + QTableMetaData archiveTable = QContext.getQInstance().getTable(runBackendStepInput.getValueString(FilesystemSyncProcess.FIELD_ARCHIVE_TABLE)); + QTableMetaData processingTable = QContext.getQInstance().getTable(runBackendStepInput.getValueString(FilesystemSyncProcess.FIELD_PROCESSING_TABLE)); - QBackendMetaData sourceBackend = runBackendStepInput.getInstance().getBackendForTable(sourceTable.getName()); + QBackendMetaData sourceBackend = QContext.getQInstance().getBackendForTable(sourceTable.getName()); FilesystemBackendModuleInterface sourceModule = (FilesystemBackendModuleInterface) new QBackendModuleDispatcher().getQBackendModule(sourceBackend); AbstractBaseFilesystemAction sourceActionBase = sourceModule.getActionBase(); sourceActionBase.preAction(sourceBackend); Map sourceFiles = getFileNames(sourceActionBase, sourceTable, sourceBackend); - QBackendMetaData archiveBackend = runBackendStepInput.getInstance().getBackendForTable(archiveTable.getName()); + QBackendMetaData archiveBackend = QContext.getQInstance().getBackendForTable(archiveTable.getName()); FilesystemBackendModuleInterface archiveModule = (FilesystemBackendModuleInterface) new QBackendModuleDispatcher().getQBackendModule(archiveBackend); AbstractBaseFilesystemAction archiveActionBase = archiveModule.getActionBase(); archiveActionBase.preAction(archiveBackend); Set archiveFiles = getFileNames(archiveActionBase, archiveTable, archiveBackend).keySet(); - QBackendMetaData processingBackend = runBackendStepInput.getInstance().getBackendForTable(processingTable.getName()); + QBackendMetaData processingBackend = QContext.getQInstance().getBackendForTable(processingTable.getName()); FilesystemBackendModuleInterface processingModule = (FilesystemBackendModuleInterface) new QBackendModuleDispatcher().getQBackendModule(processingBackend); AbstractBaseFilesystemAction processingActionBase = processingModule.getActionBase(); processingActionBase.preAction(processingBackend); 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 b174373b..6549a3e2 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 @@ -30,6 +30,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; import com.kingsrook.qqq.backend.core.actions.interfaces.AggregateInterface; import com.kingsrook.qqq.backend.core.actions.tables.helpers.ActionTimeoutHelper; +import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.exceptions.QUserFacingException; import com.kingsrook.qqq.backend.core.logging.QLogger; @@ -70,11 +71,11 @@ public class RDBMSAggregateAction extends AbstractRDBMSAction implements Aggrega QTableMetaData table = aggregateInput.getTable(); QQueryFilter filter = clonedOrNewFilter(aggregateInput.getFilter()); - JoinsContext joinsContext = new JoinsContext(aggregateInput.getInstance(), table.getName(), aggregateInput.getQueryJoins(), filter); + JoinsContext joinsContext = new JoinsContext(QContext.getQInstance(), table.getName(), aggregateInput.getQueryJoins(), filter); List params = new ArrayList<>(); - String fromClause = makeFromClause(aggregateInput.getInstance(), table.getName(), joinsContext, params); + String fromClause = makeFromClause(QContext.getQInstance(), table.getName(), joinsContext, params); List selectClauses = buildSelectClauses(aggregateInput, joinsContext); String sql = "SELECT " + StringUtils.join(", ", selectClauses) 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 a24890f1..953fbdaa 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 @@ -30,6 +30,7 @@ import java.util.List; import java.util.concurrent.TimeUnit; import com.kingsrook.qqq.backend.core.actions.interfaces.CountInterface; import com.kingsrook.qqq.backend.core.actions.tables.helpers.ActionTimeoutHelper; +import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.exceptions.QUserFacingException; import com.kingsrook.qqq.backend.core.logging.QLogger; @@ -63,7 +64,7 @@ public class RDBMSCountAction extends AbstractRDBMSAction implements CountInterf QTableMetaData table = countInput.getTable(); QQueryFilter filter = clonedOrNewFilter(countInput.getFilter()); - JoinsContext joinsContext = new JoinsContext(countInput.getInstance(), countInput.getTableName(), countInput.getQueryJoins(), filter); + JoinsContext joinsContext = new JoinsContext(QContext.getQInstance(), countInput.getTableName(), countInput.getQueryJoins(), filter); JoinsContext.FieldAndTableNameOrAlias fieldAndTableNameOrAlias = joinsContext.getFieldAndTableNameOrAlias(table.getPrimaryKeyField()); boolean requiresDistinct = doesSelectClauseRequireDistinct(table); @@ -77,7 +78,7 @@ public class RDBMSCountAction extends AbstractRDBMSAction implements CountInterf List params = new ArrayList<>(); String sql = clausePrefix + " AS record_count " - + " FROM " + makeFromClause(countInput.getInstance(), table.getName(), joinsContext, params) + + " FROM " + makeFromClause(QContext.getQInstance(), table.getName(), joinsContext, params) + " WHERE " + makeWhereClause(joinsContext, filter, params); // todo sql customization - can edit sql and/or param list 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 5d4cddf8..9869435d 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 @@ -29,6 +29,7 @@ import java.util.List; import java.util.stream.Collectors; import com.kingsrook.qqq.backend.core.actions.interfaces.DeleteInterface; import com.kingsrook.qqq.backend.core.actions.tables.DeleteAction; +import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.logging.QLogger; import com.kingsrook.qqq.backend.core.model.actions.tables.delete.DeleteInput; @@ -273,7 +274,7 @@ public class RDBMSDeleteAction extends AbstractRDBMSAction implements DeleteInte QTableMetaData table = deleteInput.getTable(); String tableName = getTableName(table); - JoinsContext joinsContext = new JoinsContext(deleteInput.getInstance(), table.getName(), new ArrayList<>(), deleteInput.getQueryFilter()); + JoinsContext joinsContext = new JoinsContext(QContext.getQInstance(), table.getName(), new ArrayList<>(), deleteInput.getQueryFilter()); String whereClause = makeWhereClause(joinsContext, filter, params); // todo sql customization - can edit sql and/or param list? 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 5b687cd7..ca3d5591 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 @@ -37,6 +37,7 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import com.kingsrook.qqq.backend.core.actions.interfaces.QueryInterface; import com.kingsrook.qqq.backend.core.actions.tables.helpers.ActionTimeoutHelper; +import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.exceptions.QUserFacingException; import com.kingsrook.qqq.backend.core.instances.QMetaDataVariableInterpreter; @@ -95,10 +96,10 @@ public class RDBMSQueryAction extends AbstractRDBMSAction implements QueryInterf StringBuilder sql = new StringBuilder(makeSelectClause(queryInput)); QQueryFilter filter = clonedOrNewFilter(queryInput.getFilter()); - JoinsContext joinsContext = new JoinsContext(queryInput.getInstance(), tableName, queryInput.getQueryJoins(), filter); + JoinsContext joinsContext = new JoinsContext(QContext.getQInstance(), tableName, queryInput.getQueryJoins(), filter); List params = new ArrayList<>(); - sql.append(" FROM ").append(makeFromClause(queryInput.getInstance(), tableName, joinsContext, params)); + sql.append(" FROM ").append(makeFromClause(QContext.getQInstance(), tableName, joinsContext, params)); sql.append(" WHERE ").append(makeWhereClause(joinsContext, filter, params)); if(filter != null && CollectionUtils.nullSafeHasContents(filter.getOrderBys())) @@ -141,7 +142,7 @@ public class RDBMSQueryAction extends AbstractRDBMSAction implements QueryInterf { if(queryJoin.getSelect()) { - QTableMetaData joinTable = queryInput.getInstance().getTable(queryJoin.getJoinTable()); + QTableMetaData joinTable = QContext.getQInstance().getTable(queryJoin.getJoinTable()); String tableNameOrAlias = queryJoin.getJoinTableOrItsAlias(); for(QFieldMetaData joinField : joinTable.getFields().values()) { @@ -289,7 +290,7 @@ public class RDBMSQueryAction extends AbstractRDBMSAction implements QueryInterf *******************************************************************************/ private String makeSelectClause(QueryInput queryInput) throws QException { - QInstance instance = queryInput.getInstance(); + QInstance instance = QContext.getQInstance(); String tableName = queryInput.getTableName(); List queryJoins = queryInput.getQueryJoins(); QTableMetaData table = instance.getTable(tableName); 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 5faa8c08..48dfef38 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 @@ -52,6 +52,7 @@ import com.kingsrook.qqq.backend.core.actions.reporting.GenerateReportAction; import com.kingsrook.qqq.backend.core.actions.tables.InsertAction; import com.kingsrook.qqq.backend.core.actions.tables.StorageAction; import com.kingsrook.qqq.backend.core.actions.values.QValueFormatter; +import com.kingsrook.qqq.backend.core.context.QContext; import com.kingsrook.qqq.backend.core.exceptions.QBadRequestException; import com.kingsrook.qqq.backend.core.exceptions.QNotFoundException; import com.kingsrook.qqq.backend.core.exceptions.QPermissionDeniedException; @@ -590,7 +591,7 @@ public class QJavalinProcessHandler *******************************************************************************/ private static QQueryFilter buildProcessInitRecordsFilter(Context context, RunProcessInput runProcessInput) throws IOException { - QInstance instance = runProcessInput.getInstance(); + QInstance instance = QContext.getQInstance(); QProcessMetaData process = instance.getProcess(runProcessInput.getProcessName()); QTableMetaData table = instance.getTable(process.getTableName());