CE-1172 - finish a somewhat usable version of field-level locks - but note - only removing the field from the meta-data that goes to the frontend -- queries, for example, will still fetch the field and send it through.

In touching some code here, remove some un-used old ActionInput parameters.

.circleci/adjust-pom-version.sh

@@ -1,51 +1,23 @@
 #!/bin/bash
 
-############################################################################
-## adjust-pom.version.sh
-## During CircleCI builds - edit the qqq parent pom.xml, to set the
-## <revision> value such that:
-## - feature-branch builds, tagged as snapshot-*, deploy with a version
-##   number that includes that tag's name (minus the snapshot- part)
-## - integration-branch builds deploy with a version number that includes
-##   the branch name slugified
-## - we never deploy -SNAPSHOT versions any more - because we don't believe
-##   it is ever valid to not know exactly what versions you are getting
-##   (perhaps because we are too loose with our versioning?)
-############################################################################
+if [ -z "$CIRCLE_BRANCH" ] && [ -z "$CIRCLE_TAG" ]; then
+   echo "Error:  env vars CIRCLE_BRANCH and CIRCLE_TAG were not set."
+   exit 1;
+fi
 
-POM=$(dirname $0)/../pom.xml
-echo "On branch: $CIRCLE_BRANCH, tag: $CIRCLE_TAG..."
-
-######################################################################
-## ## only do anything if the committed pom has a -SNAPSHOT version ##
-######################################################################
-REVISION=$(grep '<revision>' $POM | sed 's/.*<revision>//;s/<.*//');
-echo "<revision> in pom.xml is: $REVISION"
-if [ \! $(echo "$REVISION" | grep SNAPSHOT) ]; then
-   echo "Not on a SNAPSHOT revision, so nothing to do here."
+if [ "$CIRCLE_BRANCH" == "dev" ] || [ "$CIRCLE_BRANCH" == "staging" ] || [ "$CIRCLE_BRANCH" == "main" ] || [ \! -z $(echo "$CIRCLE_TAG" | grep "^version-") ]; then
+   echo "On a primary branch or tag [${CIRCLE_BRANCH}${CIRCLE_TAG}] - will not edit the pom version.";
    exit 0;
 fi
 
-##################################################################################
-## ## figure out if we need a SLUG:  a snapshot- tag, or an integration/ branch ##
-##################################################################################
-SLUG=""
-if [ $(echo "$CIRCLE_TAG" | grep ^snapshot-) ]; then
-   SLUG=$(echo "$CIRCLE_TAG" | sed "s/^snapshot-//")-
-   echo "Using slug [$SLUG] from tag [$CIRCLE_TAG]"
-
-elif [ $(echo "$CIRCLE_BRANCH" |  grep ^integration/) ]; then
-   SLUG=$(echo "$CIRCLE_BRANCH" | sed "s,/,-,g")-
-   echo "Using slug [$SLUG] from branch [$CIRCLE_BRANCH]"
+if [ -n "$CIRCLE_BRANCH" ]; then
+   SLUG=$(echo $CIRCLE_BRANCH | sed 's/[^a-zA-Z0-9]/-/g')
+else
+   SLUG=$(echo $CIRCLE_TAG | sed 's/^snapshot-//g')
 fi
 
-################################################################
-## ## build the replcaement for -SNAPSHOT, and update the pom ##
-################################################################
-TIMESTAMP=$(date +%Y%m%d-%H%M%S)
-REPLACEMENT=${SLUG}${TIMESTAMP}
+POM=$(dirname $0)/../pom.xml
 
-echo "Updating $POM -SNAPSHOT to: -$REPLACEMENT"
-sed -i "s/-SNAPSHOT<\/revision>/-$REPLACEMENT<\/revision>/" $POM
+echo "Updating $POM <revision> to: $SLUG-SNAPSHOT"
+sed -i "s/<revision>.*/<revision>$SLUG-SNAPSHOT<\/revision>/" $POM
 git diff $POM
-

.circleci/config.yml

@@ -2,7 +2,6 @@ version: 2.1
 
 orbs:
   localstack: localstack/platform@2.1
-  browser-tools: circleci/browser-tools@1.4.7
 
 commands:
   store_jacoco_site:
@@ -39,8 +38,6 @@ commands:
       - restore_cache:
           keys:
             - v1-dependencies-{{ checksum "pom.xml" }}
-      - browser-tools/install-chrome
-      - browser-tools/install-chromedriver
       - run:
           name: Write .env
           command: |
@@ -82,19 +79,6 @@ commands:
             - ~/.m2
           key: v1-dependencies-{{ checksum "pom.xml" }}
 
-  check_middleware_api_versions:
-      steps:
-        - checkout
-        - restore_cache:
-            keys:
-              - v1-dependencies-{{ checksum "pom.xml" }}
-        - run:
-            name: Build and Run ValidateApiVersions
-            command: |
-              mvn -s .circleci/mvn-settings.xml -T4 install -DskipTests
-              mvn -s .circleci/mvn-settings.xml -pl qqq-middleware-javalin package appassembler:assemble -DskipTests
-              qqq-middleware-javalin/target/appassembler/bin/ValidateApiVersions -r $(pwd)
-
   mvn_jar_deploy:
     steps:
       - checkout
@@ -130,9 +114,14 @@ commands:
           command: |
             cd docs
             asciidoctor -a docinfo=shared index.adoc
-      - store_artifacts:
-          path: docs/index.html
-          when: always
+
+  upload_docs_site:
+    steps:
+      - run:
+          name: scp html to justinsgotskinnylegs.com
+          command: |
+            cd docs
+            scp index.html dkelkhoff@45.79.44.221:/mnt/first-volume/dkelkhoff/nginx/html/justinsgotskinnylegs.com/qqq-docs.html
 
 jobs:
   mvn_test:
@@ -141,7 +130,6 @@ jobs:
       ## - localstack/startup
       - install_java17
       - mvn_verify
-      - check_middleware_api_versions
 
   mvn_deploy:
     executor: localstack/default
@@ -149,7 +137,6 @@ jobs:
       ## - localstack/startup
       - install_java17
       - mvn_verify
-      - check_middleware_api_versions
       - mvn_jar_deploy
 
   publish_asciidoc:
@@ -157,6 +144,7 @@ jobs:
     steps:
       - install_asciidoctor
       - run_asciidoctor
+      - upload_docs_site
 
 workflows:
   test_only:

.github/actions/install_asciidoctor/action.yml

@@ -1,10 +0,0 @@
-name: install_asciidoctor
-runs:
-  using: composite
-  steps:
-  - uses: actions/checkout@v4.1.0
-  - name: Install asciidoctor
-    run: |-
-      sudo apt-get update
-      sudo apt install -y asciidoctor
-    shell: bash

.github/actions/install_java17/action.yml

@@ -1,16 +0,0 @@
-name: install_java17
-runs:
-  using: composite
-  steps:
-  - name: Install Java 17
-    run: |-
-      sudo apt-get update
-      sudo apt install -y openjdk-17-jdk
-      sudo rm /etc/alternatives/java
-      sudo ln -s /usr/lib/jvm/java-17-openjdk-amd64/bin/java /etc/alternatives/java
-    shell: bash
-  - name: Install html2text
-    run: |-
-      sudo apt-get update
-      sudo apt-get install -y html2text
-    shell: bash

.github/actions/mvn_jar_deploy/action.yml

@@ -1,22 +0,0 @@
-name: mvn_jar_deploy
-runs:
-  using: composite
-  steps:
-  - uses: actions/checkout@v4.1.0
-  - name: Adjust pom version
-    run: ".circleci/adjust-pom-version.sh"
-    shell: bash
-  - name: restore_cache
-    uses: actions/cache@v3.3.2
-    with:
-      key: v1-dependencies-{{ checksum "pom.xml" }}
-      path: UPDATE_ME
-      restore-keys: v1-dependencies-{{ checksum "pom.xml" }}
-  - name: Run Maven Jar Deploy
-    run: mvn -s .circleci/mvn-settings.xml -T4 flatten:flatten jar:jar deploy:deploy
-    shell: bash
-  - name: save_cache
-    uses: actions/cache@v3.3.2
-    with:
-      path: "~/.m2"
-      key: v1-dependencies-{{ checksum "pom.xml" }}

.github/actions/mvn_verify/action.yml

@@ -1,61 +0,0 @@
-name: mvn_verify
-runs:
-  using: composite
-  steps:
-  - uses: actions/checkout@v4.1.0
-  - name: restore_cache
-    uses: actions/cache@v3.3.2
-    with:
-      key: v1-dependencies-{{ checksum "pom.xml" }}
-      path: UPDATE_ME
-      restore-keys: v1-dependencies-{{ checksum "pom.xml" }}
-  - name: Write .env
-    run: echo "RDBMS_PASSWORD=$RDBMS_PASSWORD" >> qqq-sample-project/.env
-    shell: bash
-  - name: Run Maven Verify
-    run: mvn -s .circleci/mvn-settings.xml -T4 verify
-    shell: bash
-  - uses: "./.github/actions/store_jacoco_site"
-    with:
-      module: qqq-backend-core
-  - uses: "./.github/actions/store_jacoco_site"
-    with:
-      module: qqq-backend-module-filesystem
-  - uses: "./.github/actions/store_jacoco_site"
-    with:
-      module: qqq-backend-module-rdbms
-  - uses: "./.github/actions/store_jacoco_site"
-    with:
-      module: qqq-backend-module-api
-  - uses: "./.github/actions/store_jacoco_site"
-    with:
-      module: qqq-middleware-api
-  - uses: "./.github/actions/store_jacoco_site"
-    with:
-      module: qqq-middleware-javalin
-  - uses: "./.github/actions/store_jacoco_site"
-    with:
-      module: qqq-middleware-picocli
-  - uses: "./.github/actions/store_jacoco_site"
-    with:
-      module: qqq-middleware-slack
-  - uses: "./.github/actions/store_jacoco_site"
-    with:
-      module: qqq-language-support-javascript
-  - uses: "./.github/actions/store_jacoco_site"
-    with:
-      module: qqq-sample-project
-  - name: Save test results
-    run: |-
-      mkdir -p ~/test-results/junit/
-      find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} ~/test-results/junit/ \;
-    if: always()
-    shell: bash
-  - uses: actions/upload-artifact@v4.1.0
-    with:
-      path: "~/test-results"
-  - name: save_cache
-    uses: actions/cache@v3.3.2
-    with:
-      path: "~/.m2"
-      key: v1-dependencies-{{ checksum "pom.xml" }}

.github/actions/run_asciidoctor/action.yml

@@ -1,9 +0,0 @@
-name: run_asciidoctor
-runs:
-  using: composite
-  steps:
-  - name: Run asciidoctor
-    run: |-
-      cd docs
-      asciidoctor -a docinfo=shared index.adoc
-    shell: bash

.github/actions/store_jacoco_site/action.yml

@@ -1,13 +0,0 @@
-name: store_jacoco_site
-inputs:
-  module:
-    required: false
-runs:
-  using: composite
-  steps:
-  - uses: actions/upload-artifact@v4.1.0
-    with:
-      path: "${{ inputs.module }}/target/site/jacoco/index.html"
-  - uses: actions/upload-artifact@v4.1.0
-    with:
-      path: "${{ inputs.module }}/target/site/jacoco/jacoco-resources"

.github/actions/upload_docs_site/action.yml

@@ -1,9 +0,0 @@
-name: upload_docs_site
-runs:
-  using: composite
-  steps:
-  - name: scp html to justinsgotskinnylegs.com
-    run: |-
-      cd docs
-      scp index.html dkelkhoff@45.79.44.221:/mnt/first-volume/dkelkhoff/nginx/html/justinsgotskinnylegs.com/qqq-docs.html
-    shell: bash

.github/workflows/codacy.yml

@@ -1,61 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
-# This workflow checks out code, performs a Codacy security scan
-# and integrates the results with the
-# GitHub Advanced Security code scanning feature.  For more information on
-# the Codacy security scan action usage and parameters, see
-# https://github.com/codacy/codacy-analysis-cli-action.
-# For more information on Codacy Analysis CLI in general, see
-# https://github.com/codacy/codacy-analysis-cli.
-
-name: Codacy Security Scan
-
-on:
-  push:
-    branches: [ "security" ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ "security" ]
-  schedule:
-    - cron: '26 5 * * 4'
-
-permissions:
-  contents: read
-
-jobs:
-  codacy-security-scan:
-    permissions:
-      contents: read # for actions/checkout to fetch code
-      security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
-      actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
-    name: Codacy Security Scan
-    runs-on: ubuntu-latest
-    steps:
-      # Checkout the repository to the GitHub Actions runner
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      # Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
-      - name: Run Codacy Analysis CLI
-        uses: codacy/codacy-analysis-cli-action@d840f886c4bd4edc059706d09c6a1586111c540b
-        with:
-          # Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
-          # You can also omit the token and run the tools that support default configurations
-          project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
-          verbose: true
-          output: results.sarif
-          format: sarif
-          # Adjust severity of non-security issues
-          gh-code-scanning-compat: true
-          # Force 0 exit code to allow SARIF file generation
-          # This will handover control about PR rejection to the GitHub side
-          max-allowed-issues: 2147483647
-
-      # Upload the SARIF file generated in the previous step
-      - name: Upload SARIF results file
-        uses: github/codeql-action/upload-sarif@v2
-        with:
-          sarif_file: results.sarif

.github/workflows/codeql.yml

@@ -1,93 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ "security" ]
-  pull_request:
-    branches: [ "security" ]
-  schedule:
-    - cron: '31 10 * * 3'
-
-jobs:
-  analyze:
-    name: Analyze (${{ matrix.language }})
-    # Runner size impacts CodeQL analysis time. To learn more, please see:
-    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
-    #   - https://gh.io/supported-runners-and-hardware-resources
-    #   - https://gh.io/using-larger-runners (GitHub.com only)
-    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
-    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
-    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
-    permissions:
-      # required for all workflows
-      security-events: write
-
-      # required to fetch internal or private CodeQL packs
-      packages: read
-
-      # only required for workflows in private repositories
-      actions: read
-      contents: read
-
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-        - language: java-kotlin
-          build-mode: none # This mode only analyzes Java. Set this to 'autobuild' or 'manual' to analyze Kotlin too.
-        # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
-        # Use `c-cpp` to analyze code written in C, C++ or both
-        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
-        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
-        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
-        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
-        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
-        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v4
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
-      with:
-        languages: ${{ matrix.language }}
-        build-mode: ${{ matrix.build-mode }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-
-        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
-        # queries: security-extended,security-and-quality
-
-    # If the analyze step fails for one of the languages you are analyzing with
-    # "We were unable to automatically build your code", modify the matrix above
-    # to set the build mode to "manual" for that language. Then modify this step
-    # to build your code.
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
-    - if: matrix.build-mode == 'manual'
-      shell: bash
-      run: |
-        echo 'If you are using a "manual" build mode for one or more of the' \
-          'languages you are analyzing, replace this with the commands to build' \
-          'your code, for example:'
-        echo '  make bootstrap'
-        echo '  make release'
-        exit 1
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
-      with:
-        category: "/language:${{matrix.language}}"

.github/workflows/deploy.yml

@@ -1,20 +0,0 @@
-name: Kingsrook/qqq/deploy
-on:
-  push:
-    branches:
-    - release
-jobs:
-  mvn_deploy:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/install_java17"
-    - uses: "./.github/actions/mvn_verify"
-    - uses: "./.github/actions/mvn_jar_deploy"
-  publish_asciidoc:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/install_asciidoctor"
-    - uses: "./.github/actions/run_asciidoctor"
-    - uses: "./.github/actions/upload_docs_site"

.github/workflows/test_only.yml

@@ -1,12 +0,0 @@
-name: Kingsrook/qqq/test_only
-on:
-  push:
-    branches:
-    - release
-jobs:
-  mvn_test:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4.1.0
-    - uses: "./.github/actions/install_java17"
-    - uses: "./.github/actions/mvn_verify"

.gitignore

@@ -35,5 +35,3 @@ hs_err_pid*
 *.swp
 .flattened-pom.xml
 dependency-reduced-pom.xml
-/.env.local
-/.cache/

CONTRIBUTING.md

@@ -1,144 +0,0 @@
-# Contributing to QQQ
-
-First off, thanks for taking the time to contribute! ❤️
-
-All types of contributions are encouraged and valued. See the [Table of Contents](#table-of-contents) for different ways to help and details about how this project handles them. Please make sure to read the relevant section before making your contribution. It will make it a lot easier for us maintainers and smooth out the experience for all involved. The community looks forward to your contributions. 🎉
-
-> And if you like the project, but just don't have time to contribute, that's fine. There are other easy ways to support the project and show your appreciation, which we would also be very happy about:
-> - Star the project
-> - Tweet about it
-> - Refer this project in your project's readme
-> - Mention the project at local meetups and tell your friends/colleagues
-
-
-## Table of Contents
-
-- [Code of Conduct](#code-of-conduct)
-- [I Have a Question](#i-have-a-question)
-- [I Want To Contribute](#i-want-to-contribute)
-- [Reporting Bugs](#reporting-bugs)
-- [Suggesting Enhancements](#suggesting-enhancements)
-- [Your First Code Contribution](#your-first-code-contribution)
-- [Improving The Documentation](#improving-the-documentation)
-- [Styleguides](#styleguides)
-- [Commit Messages](#commit-messages)
-- [Join The Project Team](#join-the-project-team)
-
-
-## Code of Conduct
-
-We do not have a published Code of Conduct at this time.  
-Lacking that, please just follow the [Golden Rule](https://en.wikipedia.org/wiki/Golden_Rule)
-
-
-## I Have a Question
-
-> If you want to ask a question, we assume that you have read the available [Documentation](https://justinsgotskinnylegs.com/qqq-docs.html).
-
-Before you ask a question, it is best to search for existing [Issues](/issues) that might help you. In case you have found a suitable issue and still need clarification, you can write your question in this issue. It is also advisable to search the internet for answers first.
-
-If you then still feel the need to ask a question and need clarification, we recommend the following:
-
-- Open an [Issue](/issues/new).
-- Provide as much context as you can about what you're running into.
-- Provide project and platform versions, depending on what seems relevant.
-
-We will then take care of the issue as soon as possible.
-
-
-
-## I Want To Contribute
-
-> ### Legal Notice 
-> When contributing to this project, you must agree that you have authored 100% of the content, that you have the necessary rights to the content and that the content you contribute may be provided under the project license.
-
-### Reporting Bugs
-
-
-#### Before Submitting a Bug Report
-
-A good bug report shouldn't leave others needing to chase you up for more information. Therefore, we ask you to investigate carefully, collect information and describe the issue in detail in your report. Please complete the following steps in advance to help us fix any potential bug as fast as possible.
-
-- Make sure that you are using the latest version.
-- Determine if your bug is really a bug and not an error on your side e.g. using incompatible environment components/versions (Make sure that you have read the [documentation](https://justinsgotskinnylegs.com/qqq-docs.html). If you are looking for support, you might want to check [this section](#i-have-a-question)).
-- To see if other users have experienced (and potentially already solved) the same issue you are having, check if there is not already a bug report existing for your bug or error in the [bug tracker](issues?q=label%3Abug).
-- Also make sure to search the internet (including Stack Overflow) to see if users outside of the GitHub community have discussed the issue.
-- Collect information about the bug:
-  - Stack trace
-  - OS, Platform and Version (Windows, Linux, macOS, x86, ARM)
-  - Version of the interpreter, compiler, SDK, runtime environment, package manager, depending on what seems relevant.
-  - Possibly your input and the output
-  - Can you reliably reproduce the issue? And can you also reproduce it with older versions?
-
-
-#### How Do I Submit a Good Bug Report?
-
-> You must never report security related issues, vulnerabilities or bugs including sensitive information to the issue tracker, or elsewhere in public. Instead sensitive bugs must be sent by email to <contact@kingsrook.com>.
-
-
-We use GitHub issues to track bugs and errors. If you run into an issue with the project:
-
-- Open an [Issue](/issues/new). (Since we can't be sure at this point whether it is a bug or not, we ask you not to talk about a bug yet and not to label the issue.)
-- Explain the behavior you would expect and the actual behavior.
-- Please provide as much context as possible and describe the *reproduction steps* that someone else can follow to recreate the issue on their own. This usually includes your code. For good bug reports you should isolate the problem and create a reduced test case.
-- Provide the information you collected in the previous section.
-
-Once it's filed:
-
-- The project team will label the issue accordingly.
-- A team member will try to reproduce the issue with your provided steps. If there are no reproduction steps or no obvious way to reproduce the issue, the team will ask you for those steps and mark the issue as `needs-repro`. Bugs with the `needs-repro` tag will not be addressed until they are reproduced.
-- If the team is able to reproduce the issue, it will be marked `needs-fix`, as well as possibly other tags (such as `critical`), and the issue will be left to be [implemented by someone](#your-first-code-contribution).
-
-
-
-
-### Suggesting Enhancements
-
-This section guides you through submitting an enhancement suggestion for QQQ, **including completely new features and minor improvements to existing functionality**. Following these guidelines will help maintainers and the community to understand your suggestion and find related suggestions.
-
-
-#### Before Submitting an Enhancement
-
-- Make sure that you are using the latest version.
-- Read the [documentation](https://justinsgotskinnylegs.com/qqq-docs.html) carefully and find out if the functionality is already covered, maybe by an individual configuration.
-- Perform a [search](/issues) to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
-- Find out whether your idea fits with the scope and aims of the project. It's up to you to make a strong case to convince the project's developers of the merits of this feature. Keep in mind that we want features that will be useful to the majority of our users and not just a small subset. If you're just targeting a minority of users, consider writing an add-on/plugin library.
-
-
-#### How Do I Submit a Good Enhancement Suggestion?
-
-Enhancement suggestions are tracked as [GitHub issues](/issues).
-
-- Use a **clear and descriptive title** for the issue to identify the suggestion.
-- Provide a **step-by-step description of the suggested enhancement** in as many details as possible.
-- **Describe the current behavior** and **explain which behavior you expected to see instead** and why. At this point you can also tell which alternatives do not work for you.
-- You may want to **include screenshots and animated GIFs** which help you demonstrate the steps or point out the part which the suggestion is related to. You can use [this tool](https://www.cockos.com/licecap/) to record GIFs on macOS and Windows, and [this tool](https://github.com/colinkeenan/silentcast) or [this tool](https://github.com/GNOME/byzanz) on Linux. 
-- **Explain why this enhancement would be useful** to most QQQ users. You may also want to point out the other projects that solved it better and which could serve as inspiration.
-
-
-
-### Your First Code Contribution
-
-Unfortunately, we are not prepared at this time for accepting external code contributions in any meaningful way.  We don't have process in place for reviewing pull requests.  So, the best we can do right now would be to accept suggestions via issues, as referenced above.
-
-### Improving The Documentation
-
-Unfortunately, we are not prepared at this time for accepting external documentation contributions in any meaningful way.  We don't have process in place for reviewing pull requests.  So, the best we can do right now would be to accept suggestions via issues, as referenced above.
-
-
-## Styleguides
-
-To be documented at a point when we become ready to accept code contributions.
-
-### Commit Messages
-
-To be documented at a point when we become ready to accept code contributions.
-
-## Join The Project Team
-
-To be documented at a point when we become ready to accept more team members.
-
-
-## Attribution
-This guide is based on the **contributing.md**. [Make your own](https://contributing.md/)!
-

LICENSE.txt

@@ -1,619 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS

README.md

@@ -5,34 +5,21 @@ This is the top-level/parent project of qqq.
 QQQ is a Low-code Application Framework for Engineers.
 
 ## Artifacts
-*Note, this information - well, I'd say it's out of date, but honestly, I don't
-think this was ever accurate, lol.  Either way, it needs re-written, please.
-Should refrence the bom-pom, and there is no "bundle" concept at present.*
+QQQ can be used with a single bundle or smaller fine grained jars.
+The bundle contains all of the sub-jars.  It is named:
 
-> QQQ can be used with a single bundle or smaller fine grained jars.
-> The bundle contains all of the sub-jars.  It is named:
-> 
-> ```qqq-${version}.jar```
-> 
-> You can also use fine-grained jars:
-> - `qqq-backend-core`: The core module.  Useful if you're developing other modules.
-> - `qqq-backend-module-rdbms`: Backend module for working with Relational Databases.
-> - `qqq-backend-module-filesystem`: Backend module for working with Filesystems (including AWS S3).
-> - `qqq-middleware-javalin`: Middleware http server.  Procivdes REST API, and/or backing for a web frotnend.
-> - `qqq-middleware-picocli`: Middleware (actually, a front-end, innint?) Command Line interface.
+```qqq-${version}.jar```
 
-## Framework Developer Tools/Resources
-### IntelliJ
-There are a few useful IntelliJ settings files, under `qqq-dev-tools/intellij`:
-- Kingsrook_Code_Style.xml
-- Kingsrook_Copyright_Profile.xml
-
-One will likely also want the [Kingsrook Commentator
-Plugin](https://plugins.jetbrains.com/plugin/19325-kingsrook-commentator).
+You can also use fine-grained jars:
+- `qqq-backend-core`: The core module.  Useful if you're developing other modules.
+- `qqq-backend-module-rdbms`: Backend module for working with Relational Databases.
+- `qqq-backend-module-filesystem`: Backend module for working with Filesystems (including AWS S3).
+- `qqq-middleware-javalin`: Middleware http server.  Procivdes REST API, and/or backing for a web frotnend.
+- `qqq-middleware-picocli`: Middleware (actually, a front-end, innint?) Command Line interface.
 
 ## License
 QQQ - Low-code Application Framework for Engineers. \
-Copyright (C) 2020-2024.  Kingsrook, LLC \
+Copyright (C) 2022.  Kingsrook, LLC \
 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States \
 contact@kingsrook.com | https://github.com/Kingsrook/
 

SECURITY.md

@@ -1,21 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-Use this section to tell people about which versions of your project are
-currently being supported with security updates.
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 5.1.x   | :white_check_mark: |
-| 5.0.x   | :x:                |
-| 4.0.x   | :white_check_mark: |
-| < 4.0   | :x:                |
-
-## Reporting a Vulnerability
-
-Use this section to tell people how to report a vulnerability.
-
-Tell them where to go, how often they can expect to get an update on a
-reported vulnerability, what to expect if the vulnerability is accepted or
-declined, etc.

checkstyle/config.xml

@@ -213,6 +213,18 @@
          <property name="tokens" value="VARIABLE_DEF"/>
          <property name="allowSamelineMultipleAnnotations" value="true"/>
       </module>
+      <module name="NonEmptyAtclauseDescription"/>
+      <!-- <module name="JavadocTagContinuationIndentation"/> -->
+      <!--
+      <module name="SummaryJavadoc">
+         <property name="forbiddenSummaryFragments" value="^@return the *|^This method returns |^A [{]@code [a-zA-Z0-9]+[}]( is a )"/>
+      </module>
+      -->
+      <!-- <module name="JavadocParagraph"/> -->
+      <module name="AtclauseOrder">
+         <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
+         <property name="target" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
+      </module>
       <module name="JavadocMethod">
          <property name="allowMissingParamTags" value="true"/>
          <property name="allowMissingReturnTag" value="true"/>
@@ -221,14 +233,23 @@
       <module name="MissingJavadocMethod">
          <property name="scope" value="private"/>
       </module>
-      <module name="MissingJavadocType">
-         <property name="scope" value="private"/>
-      </module>
       <module name="MethodName">
          <property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>
          <message key="name.invalidPattern"
           value="Method name ''{0}'' must match pattern ''{1}''."/>
       </module>
+      <module name="SingleLineJavadoc">
+         <property name="ignoreInlineTags" value="false"/>
+      </module>
+
+      <module name="MagicNumber">
+         <property name="severity" value="info"/>
+         <property name="tokens" value="NUM_DOUBLE, NUM_FLOAT, NUM_INT"/>
+         <property name="ignoreNumbers" value="0, 1, 2, 3, 4, 5, 6, 7, 8"/>
+         <property name="ignoreFieldDeclaration" value="true"/>
+         <property name="ignoreAnnotation" value="true"/>
+      </module>
+
       <module name="EmptyCatchBlock">
          <property name="exceptionVariableName" value="expected"/>
       </module>

docs/Introduction.adoc

@@ -136,13 +136,17 @@ This speaks to the fact that this "code" is not executable code - but rather is
 **** The Filter button in the Query Screen will present a menu listing all fields from the table for the user to build ad-hoc queries against the table.
 The data-types specified for the fields (in the meta-data) dictate what operators QQQ allows the user to use against fields (e.g., Strings offer "contains" vs Numbers offer "greater than").
 **** Values for records from the table will be formatted for presentation based on the meta-data (such as a numeric field being shown with commas if it represents a quantity, or formatted as currency).
-* Other kinds of information that you tell QQQ about in the form of meta-data objects includes:
-** Details about the database you are using, and how to connect to it.
-** A database table's name, fields, their types, its keys, and basic business rules (required fields, read-only fields, field lengths).
-** The specification of a custom workflow (process), including what screens are needed, with input & output values, and references to the custom application code for processing the data.
-** Details about a chart that summarizes data from a table for presentation as a dashboard widget.
-** The description of web API - its URL and authentication mechanism.
-** A table/path within a web API, and the fields returned in the JSON at that endpoint.
+...
+
+[start=2]
+. *Meta Data* - declarative code - java object instances (potentially which could be read from `.yaml` files or other data sources in a future version of QQQ), which tell QQQ about the backend systems, tables, processes, reports, widgets, etc, that make up the application.
+For example:
+* Details about the database you are using, and how to connect to it.
+* A database table's name, fields, their types, its keys, and basic business rules (required fields, read-only fields, field lengths).
+* The description of web API - its URL and authentication mechanism.
+* A table/path within a web API, and the fields returned in the JSON at that endpoint.
+* The specification of a custom workflow (process), including what screens are needed, with input & output values, and references to the custom application code for processing the data.
+* Details about a chart that summarizes data from a table for presentation as a dashboard widget.
 // the section below is kinda dumb.  like, it says you have to write application code, but
 // then it just talks about how your app code gets for-free the same shit that QQQ does.
 // it should instead say more about what your custom app code is or does.
@@ -160,8 +164,7 @@ The data-types specified for the fields (in the meta-data) dictate what operator
 // * The multi-threaded, paged producer/consumer pattern used in standard framework actions is how all custom application actions are also invoked.
 // ** For example, the standard QQQ Bulk Edit action uses the same streamed-ETL process that custom application processes can use.
 // Meaning your custom processes can take full advantage of the same complex frontend, middleware, and backend structural pieces, and you can just focus on your unique busines logic needs.
-
-. *Application code* - to customize beyond what the QQQ framework does out-of-the box, and to provide application-specific business-logic.
+2. *Application code* - to customize beyond what the QQQ framework does out-of-the box, and to provide application-specific business-logic.
 QQQ provides its programmers the same classes that it internally uses for record access, resulting in a unified application model.
 For example:
 

docs/actions/QueryAction.adoc

@@ -33,6 +33,9 @@ If the {link-table} has a `POST_QUERY_CUSTOMIZER` defined, then after records ar
 * `table` - *String, Required* - Name of the table being queried against.
 * `filter` - *<<QQueryFilter>> object* - Specification for what records should be returned, based on *<<QFilterCriteria>>* objects, and how they should be sorted, based on *<<QFilterOrderBy>>* objects.
 If a `filter` is not given, then all rows in the table will be returned by the query.
+* `skip` - *Integer* - Optional number of records to be skipped at the beginning of the result set.
+e.g., for implementing pagination.
+* `limit` - *Integer* - Optional maximum number of records to be returned by the query.
 * `transaction` - *QBackendTransaction object* - Optional transaction object.
 ** Behavior for this object is backend-dependant.
 In an RDBMS backend, this object is generally needed if you want your query to see data that may have been modified within the same transaction.
@@ -52,14 +55,6 @@ But if running a query to provide data as part of a process, then this can gener
 * `shouldMaskPassword` - *boolean, default: true* - Controls whether or not fields with `type` = `PASSWORD` should be masked, or if their actual values should be returned.
 * `queryJoins` - *List of <<QueryJoin>> objects* - Optional list of tables to be joined with the main table being queried.
 See QueryJoin below for further details.
-* `fieldNamesToInclude` - *Set of String* - Optional set of field names to be included in the records.
-** Fields from a queryJoin must be prefixed by the join table's name or alias, and a period.
-Field names from the table being queried should not have any sort of prefix.
-** A `null` set here (default) means to include all fields from the table and any queryJoins set as select=true.
-** An empty set will cause an error, as well any unrecognized field names.
-** `QueryAction` will validate the set of field names, and throw an exception if any unrecognized names are given.
-** _Note that this is an optional feature, which some backend modules may not implement.
-Meaning, they would always return all fields._
 
 ==== QQueryFilter
 A key component of *<<QueryInput>>*, a *QQueryFilter* defines both what records should be included in a query's results (e.g., an SQL `WHERE`), as well as how those results should be sorted (SQL `ORDER BY`).
@@ -73,9 +68,6 @@ In general, multiple *orderBys* can be given (depending on backend implementatio
 ** Each *subFilter* can include its own additional *subFilters*.
 ** Each *subFilter* can specify a different *booleanOperator*.
 ** For example, consider the following *QQueryFilter*, that uses two *subFilters*, and a mix of *booleanOperators*
-* `skip` - *Integer* - Optional number of records to be skipped at the beginning of the result set.
-e.g., for implementing pagination.
-* `limit` - *Integer* - Optional maximum number of records to be returned by the query.
 
 [source,java]
 ----
@@ -155,9 +147,9 @@ new QFilterOrderBy()
 ----
 
 ==== QueryJoin
-* `joinTable` - *String, required (though inferrable)* - Name of the table that is being joined in to the existing query.
+* `joinTable` - *String, required* - Name of the table that is being joined in to the existing query.
 ** Will be inferred from *joinMetaData*, if *joinTable* is not set when *joinMetaData* gets set.
-* `baseTableOrAlias` - *String, required (though inferrable)* - Name of a table (or an alias) already defined in the query, to which the *joinTable* will be joined.
+* `baseTableOrAlias` - *String, required* - Name of a table (or an alias) already defined in the query, to which the *joinTable* will be joined.
 ** Will be inferred from *joinMetaData*, if *baseTableOrAlias* is not set when *joinMetaData* gets set (which will only use the leftTableName from the joinMetaData - never an alias).
 * `joinMetaData` - *QJoinMetaData object* - Optional specification of a {link-join} in the current QInstance.
 If not set, will be looked up at runtime based on *baseTableOrAlias* and *joinTable*.
@@ -165,78 +157,21 @@ If not set, will be looked up at runtime based on *baseTableOrAlias* and *joinTa
 * `alias` - *String* - Optional (unless multiple instances of the same table are being joined together, when it becomes required).
 Behavior based on SQL `FROM` clause aliases.
 If given, must be used as the part before the dot in field name specifications throughout the rest of the query input.
-* `select` - *boolean, default: false* - Specify whether fields from the *joinTable* should be selected by the query.
+* `select` - *boolean, default: false* - Specify whether fields from the *rightTable* should be selected by the query.
 If *true*, then the `QRecord` objects returned by this query will have values with corresponding to the (table-or-alias `.` field-name) form.
 * `type` - *Enum of INNER, LEFT, RIGHT, FULL, default: INNER* - specifies the SQL-style type of join being performed.
 
 [source,java]
-.Basic QueryJoin usage example:
+.QueryJoin definition examples:
 ----
-// selecting from an "orderLine" table, joined to its corresponding (parent) "order" table
+// selecting from an "orderLine" table - then join to its corresponding "order" table
 queryInput.withTableName("orderLine");
 queryInput.withQueryJoin(new QueryJoin("order").withSelect(true));
 ...
 queryOutput.getRecords().get(0).getValueBigDecimal("order.grandTotal");
-----
 
-[source,java]
-."V" shaped query - selecting from one parent table, and two children joined to it:
-----
-// TODO this needs verified for accuracy, though is a reasonable starting point as-is
-// selecting from an "order" table, and two children of it, orderLine and customer
-queryInput.withTableName("order");
-queryInput.withQueryJoin(new QueryJoin("orderLine").withSelect(true));
-queryInput.withQueryJoin(new QueryJoin("customer").withSelect(true));
-...
-QRecord joinedRecord = queryOutput.getRecords().get(0);
-joinedRecord.getValueString("orderNo");
-joinedRecord.getValueString("orderLine.sku");
-joinedRecord.getValueString("customer.firstName");
-----
-
-[source,java]
-."Chain" shaped query - selecting from one parent table, a child table, and a grandchild:
-----
-// TODO this needs verified for accuracy, though is a reasonable starting point as-is
-// selecting from an "order" table, with a "customer" child table, and an "address" sub-table
-queryInput.withTableName("order");
-queryInput.withQueryJoin(new QueryJoin("customer").withSelect(true));
-queryInput.withQueryJoin(new QueryJoin("address").withSelect(true));
-...
-QRecord joinedRecord = queryOutput.getRecords().get(0);
-joinedRecord.getValueString("orderNo");
-joinedRecord.getValueString("customer.firstName");
-joinedRecord.getValueString("address.street1");
-----
-
-[source,java]
-.QueryJoin usage example where two tables have two different joins between them:
-----
-// TODO this needs verified for accuracy, though is a reasonable starting point as-is
-// here there's a "fulfillmentPlan" table, which points at the order table (many-to-one,
-// as an order's plan can change over time, and we keep old plans around).
-// This join is named:  fulfillmentPlanJoinOrder
-//
-// The other join is "order" pointing at its current "fulfillmentPlan"
-// This join is named:  orderJoinCurrentFulfillmentPlan
-
-// to select an order along with its current fulfillment plan:
-queryInput.withTableName("order");
-queryInput.withQueryJoin(new QueryJoin(instance.getJoin("orderJoinCurrentFulfillmentPlan"))
-   .withSelect(true));
-
-// to select an order, and all fulfillment plans for an order (1 or more records):
-queryInput.withTableName("order");
-queryInput.withQueryJoin(new QueryJoin(instance.getJoin("fulfillmentPlanJoinOrder"))
-   .withSelect(true));
-----
-
-[source,java]
-.QueryJoin usage example for table with two joins to the same child table, selecting from both:
-----
 // given an "order" table with 2 foreign keys to a customer table (billToCustomerId and shipToCustomerId)
 // Note, we must supply the JoinMetaData to the QueryJoin, to drive what fields to join on in each case.
-// we must also define an alias for each of the QueryJoins
 queryInput.withTableName("order");
 queryInput.withQueryJoins(List.of(
    new QueryJoin(instance.getJoin("orderJoinShipToCustomer")
@@ -247,18 +182,11 @@ queryInput.withQueryJoins(List.of(
        .withSelect(true))));
 ...
 record.getValueString("billToCustomer.firstName")
-   + " paid for an order, to be sent to "
+   + " placed an order for "
    + record.getValueString("shipToCustomer.firstName")
 
 ----
 
-[source,java]
-.Implicit QueryJoin, where unambiguous and required by QQueryFilter
-----
-// TODO finish and verify
-queryInput.withTableName("order");
-----
-
 === QueryOutput
 * `records` - *List of QRecord* - List of 0 or more records that match the query filter.
 ** _Note:  If a *recordPipe* was supplied to the QueryInput, then calling `queryOutput.getRecords()` will result in an `IllegalStateException` being thrown - as the records were placed into the pipe as they were fetched, and cannot all be accessed as a single list._

docs/index.adoc

@@ -6,10 +6,7 @@
 
 include::Introduction.adoc[leveloffset=+1]
 
-== Meta Data Production
-include::metaData/MetaDataProduction.adoc[leveloffset=+1]
-
-== Meta Data Types
+== Meta Data
 // Organizational units
 include::metaData/QInstance.adoc[leveloffset=+1]
 include::metaData/Backends.adoc[leveloffset=+1]

docs/metaData/Fields.adoc

@@ -56,37 +56,6 @@ if the value in the field is longer than the `maxLength`, then one of the follow
 
 ----
 
-===== ValueRangeBehavior
-Used on Numeric fields.  Specifies min and/or max allowed values for the field.
-For each of min and max, the following attributes can be set:
-
-* `minValue` / `maxValue` - the number that is the limit.
-* `minAllowEqualTo` / `maxAllowEqualTo` - boolean (default true).  Controls if < (>) or ≤ (≥).
-* `minBehavior` / `maxBehavior` - enum of `ERROR` (default) or `CLIP`.
-** If `ERROR`, then a value not within the range causes an error, and the value does not get stored.
-** else if `CLIP`, then a value not within the range gets "clipped" to either be the min/max (if allowEqualTo),
-or to the min/max plus/minus the clipAmount
-* `minClipAmount` / `maxClipAmount` - Default 1.  Used when behavior is `CLIP` (only applies when
-not allowEqualTo).
-
-[source,java]
-.Examples of using ValueRangeBehavior
-----
-    new QFieldMetaData("noOfShoes", QFieldType.INTEGER)
-      .withBehavior(new ValueRangeBehavior().withMinValue(0));
-
-    new QFieldMetaData("price", QFieldType.BIG_DECIMAL)
-      .withBehavior(new ValueRangeBehavior()
-         // set the min value to be >= 0, and an error if an input is < 0.
-         .withMinValue(BigDecimal.ZERO)
-         .withMinAllowEqualTo(true)
-         .withMinBehavior(ERROR)
-         // set the max value to be < 100 - but effectively, clip larger values to 99.99
-         // here we use the .withMax() method that takes 4 params vs. calling 4 .withMax*() methods.
-         .withMax(new BigDecimal("100.00"), false, CLIP, new BigDecimal("0.01"))
-    );
-----
-
 ===== DynamicDefaultValueBehavior
 Used to set a dynamic default value to a field when it is being inserted or updated.
 For example, instead of having a hard-coded `defaultValue` specified in the field meta-data,
@@ -148,19 +117,3 @@ new QTableMetaData().withName("flights").withFields(List.of(
       .withBehavior(new DateTimeDisplayValueBehavior()
          .withDefaultZoneId("UTC"))
 ----
-
-===== CaseChangeBehavior
-A field can be made to always go through a toUpperCase or toLowerCase transformation, both before it is stored in a backend,
-and after it is read from a backend, by adding a CaseChangeBehavior to it:
-
-[source,java]
-.Examples of using CaseChangeBehavior
-----
-new QTableMetaData().withName("item").withFields(List.of(
-
-   new QFieldMetaData("sku", QFieldType.STRING)
-      .withBehavior(CaseChangeBehavior.TO_UPPER_CASE)),
-
-   new QFieldMetaData("username", QFieldType.STRING)
-      .withBehavior(CaseChangeBehavior.TO_LOWER_CASE)),
-----

docs/metaData/MetaDataProduction.adoc

@@ -1,413 +0,0 @@
-[#MetaDataProduction]
-include::../variables.adoc[]
-
-The first thing that an application built using QQQ needs to do is to define its meta data.
-This basically means the construction of a `QInstance` object, which is populated with the
-meta data objects defining the backend(s), tables, processes, possible-value sources, joins,
-authentication provider, etc, that make your application.
-
-There are various styles that can be used for how you define your meta data, and for the
-most part they can be mixed and matched.  They will be presented here based on the historical
-evolution of how they were added to QQQ, where we generally believe that better techniques have
-been added over time.  So, you may wish to skip the earlier techniques, and jump straight to
-the end of this section.  However, it can always be instructive to learn about the past, so,
-read at your own pace.
-
-== Omni-Provider
-At the most basic level, the way to populate a `QInstance` is the simple and direct approach of creating
-one big class, possibly with just one big method, and just doing all the work directly inline there.
-
-This may (clearly) violate several good engineering principles.  However, it does have the benefit of
-being simple - if all of your meta-data is defined in one place, it can be pretty simple to find where
-that place is.  So - especially in a small project, this technique may be worth continuing to consider.
-
-Re: "doing all the work" as mentioned above - what work are we talking about?  At a minimum, we need
-to construct the following meta-data objects, and pass them into our `QInstance`:
-
-* `QAuthenticationMetaData` - how (or if!) users will be authenticated to the application.
-* `QBackendMeataData` - a backend data store.
-* `QTableMetaData` - a table (within the backend).
-* `QAppMetaData` - an organizational unit to present the other elements in a UI.
-
-Here's what a single-method omni-provider could look like:
-
-[source,java]
-.About the simplest possible single-file meta-data provider
-----
-public QInstance defineQInstance()
-{
-    QInstance qInstance = new QInstance();
-
-    qInstance.setAuthentication(new QAuthenticationMetaData()
-       .withName("anonymous")
-       .withType(QAuthenticationType.FULLY_ANONYMOUS));
-
-    qInstance.addBackend(new QBackendMetaData()
-       .withBackendType(MemoryBackendModule.class)
-       .withName("memoryBackend"));
-
-    qInstance.addTable(new QTableMetaData()
-        .withName("myTable")
-        .withPrimaryKeyField("id")
-        .withBackendName("memoryBackend")
-        .withField(new QFieldMetaData("id", QFieldType.INTEGER)));
-
-    qInstance.addApp(new QAppMetaData()
-       .withName("myApp")
-       .withSectionOfChildren(new QAppSection().withName("mySection"),
-          qInstance.getTable("myTable")))
-
-   return (qInstance);
-}
-----
-
-== Multi-method Omni-Provider
-
-The next evolution of meta-data production comes by just applying some basic better-engineering
-principles, and splitting up from a single method that constructs all the things, to at least
-using unique methods to construct each thing, then calling those methods to add their results
-to the QInstance.
-
-[source,java]
-.Multi-method omni- meta-data provider
-----
-public QInstance defineQInstance()
-{
-    QInstance qInstance = new QInstance();
-    qInstance.setAuthentication(defineAuthenticationMetaData());
-    qInstance.addBackend(defineBackendMetaData());
-    qInstance.addTable(defineMyTableMetaData());
-    qInstance.addApp(defineMyAppMetaData(qInstance));
-    return qInstance;
-}
-
-public QAuthenticationMetaData defineAuthenticationMetaData()
-{
-    return new QAuthenticationMetaData()
-       .withName("anonymous")
-       .withType(QAuthenticationType.FULLY_ANONYMOUS);
-}
-
-public QBackendMetaData defineBackendMetaData()
-{
-    return new QBackendMetaData()
-       .withBackendType(MemoryBackendModule.class)
-       .withName("memoryBackend");
-}
-
-// implementations of defineMyTableMetaData() and defineMyAppMetaData(qInstance)
-// left as an exercise for the reader
-----
-
-== Multi-class Providers
-
-Then the next logical evolution would be to put each of these single meta-data producing
-objects into its own class, along with calls to those classes.  This gets us away from the
-"5000 line" single-class, and lets us stop using the word "omni":
-
-[source,java]
-.Multi-class meta-data providers
-----
-public QInstance defineQInstance()
-{
-    QInstance qInstance = new QInstance();
-    qInstance.setAuthentication(new AuthMetaDataProvider().defineAuthenticationMetaData());
-    qInstance.addBackend(new BackendMetaDataProvider().defineBackendMetaData());
-    qInstance.addTable(new MyTableMetaDataProvider().defineTableMetaData());
-    qInstance.addApp(new MyAppMetaDataProvider().defineAppMetaData(qInstance));
-    return qInstance;
-}
-
-public class AuthMetaDataProvider
-{
-    public QAuthenticationMetaData defineAuthenticationMetaData()
-    {
-        return new QAuthenticationMetaData()
-           .withName("anonymous")
-           .withType(QAuthenticationType.FULLY_ANONYMOUS);
-    }
-}
-
-public class BackendMetaDataProvider
-{
-    public QBackendMetaData defineBackendMetaData()
-    {
-        return new QBackendMetaData()
-           .withBackendType(MemoryBackendModule.class)
-           .withName("memoryBackend");
-    }
-}
-
-// implementations of MyTableMetaDataProvider and MyAppMetaDataProvider
-// left as an exercise for the reader
-----
-
-== MetaDataProducerInterface
-
-As the size of your application grows, if you're doing per-object meta-data providers, you may find it
-burdensome, when adding a new object to your instance, to have to write code for it in two places -
-that is - a new class to produce that meta-data object, AND a single line of code to add that object
-to your `QInstance`.  As such, a mechanism exists to let you avoid that line-of-code for adding the object
-to the `QInstance`.
-
-This mechanism involves adding the `MetaDataProducerInterface` to all of your classes that produce a
-meta-data object.  This interface is generic, with a type parameter that will typically be the type of
-meta-data object you are producing, such as `QTableMetaData`, `QProcessMetaData`, or `QWidgetMetaData`,
-(technically, any class which implements `TopLevelMetaData`).  Implementers of the interface are then
-required to override just one method: `T produce(QInstance qInstance) throws QException;`
-
-Once you have your `MetaDataProducerInterface` classes defined, then there's a one-time call needed
-to add all of the objects produced by these classes to your `QInstance` - as shown here:
-
-[source,java]
-.Using MetaDataProducerInterface
-----
-public QInstance defineQInstance()
-{
-    QInstance qInstance = new QInstance();
-    MetaDataProducerHelper.processAllMetaDataProducersInPackage(qInstance,
-      "com.mydomain.myapplication");
-    return qInstance;
-}
-
-public class AuthMetaDataProducer implements MetaDataProducerInterface<QAuthenticationMetaData>
-{
-    @Override
-    public QAuthenticationMetaData produce(QInstance qInstance)
-    {
-        return new QAuthenticationMetaData()
-           .withName("anonymous")
-           .withType(QAuthenticationType.FULLY_ANONYMOUS);
-    }
-}
-
-public class BackendMetaDataProducer implements MetaDataProducerInterface<QBackendMetaData>
-{
-    @Override
-    public QBackendMetaData defineBackendMetaData()
-    {
-        return new QBackendMetaData()
-           .withBackendType(MemoryBackendModule.class)
-           .withName("memoryBackend");
-    }
-}
-
-// implementations of MyTableMetaDataProvider and MyAppMetaDataProvider
-// left as an exercise for the reader
-----
-
-=== MetaDataProducerMultiOutput
-It is worth mentioning, that sometimes it might feel like a bridge that's a bit too far, to make
-every single one of your meta-data objects require its own class.  Some may argue that it's best
-to do it that way - single responsibility principle, etc.  But, if you're producing, say, 5 widgets
-that are all related, and it's only a handful of lines of code for each one, maybe you'd rather
-produce them all in the same class.  Or maybe when you define a table, you'd like to define its
-joins and widgets at the same time.
-
-This approach can be accomplished by making the type argument for your `MetaDataProducerInterface` be
-`MetaDataProducerMultiOutput` - a simple class that just wraps a list of other `MetaDataProducerOutput`
-objects.
-
-[source,java]
-.Returning a MetaDataProducerMultiOutput
-----
-public class MyMultiProducer implements MetaDataProducerInterface<MetaDataProducerMultiOutput>
-{
-    @Override
-    public MetaDataProducerMultiOutput produce(QInstance qInstance)
-    {
-       MetaDataProducerMultiOutput output = new MetaDataProducerMultiOutput();
-
-       output.add(new QPossibleValueSource()...);
-       output.add(new QJoinMetaData()...);
-       output.add(new QJoinMetaData()...);
-       output.add(new QWidgetMetaData()...);
-       output.add(new QTableMetaData()...);
-
-       return (output);
-    }
-}
-----
-
-
-== Aside: TableMetaData with RecordEntities
-At this point, let's take a brief aside to dig deeper into the creation of a `QTableMeta` object.
-Tables, being probably the most important meta-data type in QQQ, have a lot of information that can
-be specified in their meta-data object.
-
-At the same time, if you're writing any custom code in your QQQ application
-(e.g., any processes or table customizers), where you're working with records from tables, you may
-prefer being able to work with entity beans (e.g., java classes with typed getter & setter methods),
-rather than the default object type that QQQ's ORM actions return, the `QRecord`, which carries all
-of its values in a `Map` (where you don't get compile-time checks of field names or data types).
-QQQ has a mechanism for dealing with this - in the form of the `QRecordEntity` class.
-
-So - if you want to build your application using entity beans (which is recommended, for the compile-time
-safety that they provide in custom code), you will be writing a `QRecordEntity` class for each of your tables,
-which will look like:
-
-[source,java]
-.QRecordEntity example
-----
-public class MyTable extends QRecordEntity
-{
-   public static final String TABLE_NAME = "myTable";
-
-   @QField(isEditable = false, isPrimaryKey = true)
-   private Integer id;
-
-   @QField()
-   private String name;
-
-   // no-arg constructor and constructor that takes a QRecord
-   // getters & setters (and optional fluent setters)
-}
-----
-
-The point of introducing this topic here and now is, that a `QRecordEntity` can be used to shortcut to
-defining some of the attributes in a `QTableMetaData` object.  Specifically, in a `MetaDataProducer<QTableMetaData>`
-you may say:
-
-[source,java]
-.QTableMetaDataProducer using a QRecordEntity
-----
-public QTableMetaData produce(QInstance qInstance) throws QExcpetion
-{
-  return new QTableMetaData()
-     .withName(MyTable.TABLE_NAME)
-     .withFieldsFromEntity(MyTable.class)
-     .withBackendName("memoryBackend");
-}
-----
-
-That `withFieldsFromEntity` call is one of the biggest benefits of this technique.  It allows you to avoid defining
-all of the fields in you table in two places (the entity and the table meta-data).
-
-== MetaData Producing Annotations for Entities
-
-If you are using `QRecordEntity` classes that correspond to your tables, then you can take advantage of some
-additional annotations on those classes, to produce more related meta-data objects associated with those tables.
-The point of this is to eliminate boilerplate, and simplify / speed up the process of getting a new table
-built and deployed in your application.
-
-Furthermore, the case can be made that it is beneficial to keep the meta-data definition for a table as close
-as possible to the entity that corresponds to the table.  This enables modifications to the table (e.g., adding
-a new field/column) to only require edits in one java source file, rather than necessarily requiring edits
-in two files.
-
-=== @QMetaDataProducingEntity
-This is an annotation meant to be placed on a `QRecordEntity` subclass, which you would like to be
-processed by an invocation of `MetaDataProducerHelper`, to automatically produce some meta-data
-objects.
-
-This annotation supports:
-
-* Creating table meta-data for the corresponding record entity table. Enabled by setting `produceTableMetaData=true`.
-** One may customize the table meta data that is produced automatically by supplying a class that extends
-`MetaDataCustomizerInterface` in the annotation attribute `tableMetaDataCustomizer`.
-** In addition to (or as an alternative to) the per-table `MetaDataCustomizerInterface` that can be specified
-in `@QMetaDataProducingEntity.tableMetaDataCustomzier`, when an application calls
-`MetaDataProducerHelper.processAllMetaDataProducersInPackage`, an additional `MetaDataCustomizerInterface` can be
-given, to apply a common set of adjustments to all tales being generated by the call.
-* Making a possible-value-source out of the table.  Enabled by setting `producePossibleValueSource=true`.
-* Processing child tables to create joins and childRecordList widgets
-
-=== @ChildTable
-This is an annotation used as a value that goes inside a `@QMetadataProducingEntity` annotation, to define
-child-tables, e.g., for producing joins and childRecordList widgets related to the table defined in the entity class.
-
-==== @ChildJoin
-This is an annotation used as a value inside a `@ChildTable` inside a `@QMetadataProducingEntity` annotation,
-to control the generation of a `QJoinMetaData`, as a `ONE_TO_MANY` type join from the table represented by
-the annotated entity, to the table referenced in the `@ChildTable` annotation.
-
-==== @ChildRecordListWidget
-This is an annotation used as a value that goes inside a `@QMetadataProducingEntity` annotation, to control
-the generation of a QWidgetMetaData - for a ChildRecordList widget.
-
-[source,java]
-.QRecordEntity with meta-data producing annotations and a table MetaDataCustomizer
-----
-@QMetaDataProducingEntity(
-   produceTableMetaData = true,
-   tableMetaDataCustomizer = MyTable.TableMetaDataCustomizer.class,
-   producePossibleValueSource = true,
-   childTables = {
-      @ChildTable(
-         childTableEntityClass = MyChildTable.class,
-         childJoin = @ChildJoin(enabled = true),
-         childRecordListWidget = @ChildRecordListWidget(enabled = true, label = "Children"))
-   }
-)
-public class MyTable extends QRecordEntity
-{
-   public static final String TABLE_NAME = "myTable";
-
-   public static class TableMetaDataCustomizer implements MetaDataCustomizerInterface<QTableMetaData>
-   {
-      @Override
-      public QTableMetaData customizeMetaData(QInstance qInstance, QTableMetaData table) throws QException
-      {
-         String childJoinName = QJoinMetaData.makeInferredJoinName(TABLE_NAME, MyChildTable.TABLE_NAME);
-
-         table
-            .withUniqueKey(new UniqueKey("name"))
-            .withIcon(new QIcon().withName("table_bar"))
-            .withRecordLabelFormat("%s")
-            .withRecordLabelFields("name")
-
-            .withSection(new QFieldSection("identity", new QIcon().withName("badge"), Tier.T1,
-               List.of("id", "name")))
-            // todo additional sections for other fields
-            .withSection(new QFieldSection("children", new QIcon().withName("account_tree"), Tier.T2)
-               .withWidgetName(childJoinName))
-
-            .withExposedJoin(new ExposedJoin()
-               .withLabel("Children")
-               .withJoinPath(List.of(childJoinName))
-               .withJoinTable(MyChildTable.TABLE_NAME));
-
-         return (table);
-      }
-   }
-
-   @QField(isEditable = false, isPrimaryKey = true)
-   private Integer id;
-
-   // remaining fields, constructors, getters & setters left as an exercise for the reader and/or the IDE
-}
-----
-
-The class given in the example above, if processed by the `MetaDataProducerHelper`, would add the following
-meta-data objects to your `QInstance`:
-
-* A `QTableMetaData` named `myTable`, with all fields annotated as `@QField` from the `QRecordEntity` class,
-and with additional attributes as set in the `TableMetaDataCustomizer` inner class.
-* A `QPossibleValueSource` named `myTable`, of type `TABLE`, with `myTable` as its backing table.
-* A `QJoinMetaData` named `myTableJoinMyChildTable`, as a `ONE_TO_MANY` type, between those two tables.
-* A `QWidgetMetaData` named `myTableJoinMyChildTable`, as a `CHILD_RECORD_LIST` type, that will show a list of
-records from `myChildTable` as a widget, when viewing a record from `myTable`.
-
-== Other MetaData Producing Annotations
-
-Similar to these annotations for a `RecordEntity`, a similar one exists for a `PossibleValueEnum` class,
-to automatically write the meta-data to use that enum as a possible value source in your application:
-
-=== @QMetaDataProducingPossibleValueEnum
-This is an annotation to go on a `PossibleValueEnum` class, which you would like to be
-processed by MetaDataProducerHelper, to automatically produce a PossibleValueSource meta-data
-based on the enum.
-
-[source,java]
-.PossibleValueEnum with meta-data producing annotation
-----
-@QMetaDataProducingPossibleValueEnum(producePossibleValueSource = true)
-public enum MyOptionsEnum implements PossibleValueEnum<Integer>
-{
-   // values and methods left as exercise for reader
-}
-----
-The enum given in the example above, if processed by the `MetaDataProducerHelper`, would add the following
-meta-data object to your `QInstance`:
-
-* A `QPossibleValueSource` named `MyOptionsEnum`, of type `ENUM`, with `MyOptionsEnum` as its backing enum.

docs/metaData/Processes.adoc

@@ -38,13 +38,6 @@ See {link-permissionRules} for details.
 *** 1) by a single call to `.withStepList(List<QStepMetaData>)`, which internally adds each step into the `steps` map.
 *** 2) by multiple calls to `.addStep(QStepMetaData)`, which adds a step to both the `stepList` and `steps` map.
 ** If a process also needs optional steps (for a <<_custom_process_flow>>), they should be added by a call to `.addOptionalStep(QStepMetaData)`, which only places them in the `steps` map.
-* `stepFlow` - *enum, default LINEAR* - specifies the the flow-control logic between steps.  Possible values are:
-** `LINEAR` - steps are executed in-order, through the `stepList`.
-A backend step _can_ customize the `nextStepName` or re-order the `stepList`, if needed.
-In a frontend step, a user may be given the option to go _back_ to a previous step as well.
-** `STATE_MACHINE` - steps are executed as a Fine State Machine, starting with the first step in `stepList`,
-but then proceeding based on the `nextStepName` specified by the previous step.
-Thus allowing much more flexible flows.
 * `schedule` - *<<QScheduleMetaData>>* - set up the process to run automatically on the specified schedule.
 See below for details.
 * `minInputRecords` - *Integer* - #not used...#
@@ -74,11 +67,6 @@ For processes with a user-interface, they must define one or more "screens" in t
 * `formFields` - *List of String* - list of field names used by the screen as form-inputs.
 * `viewFields` - *List of String* - list of field names used by the screen as visible outputs.
 * `recordListFields` - *List of String* - list of field names used by the screen in a record listing.
-* `format` - *Optional String* - directive for a frontend to use specialized formatting for the display of the process.
-** Consult frontend documentation for supported values and their meanings.
-* `backStepName` - *Optional String* - For processes using `LINEAR` flow, if this value is given,
-then the frontend should offer a control that the user can take (e.g., a button) to move back to an
-earlier step in the process.
 
 ==== QFrontendComponentMetaData
 
@@ -102,13 +90,10 @@ Expects a process value named `html`.
 Expects process values named `downloadFileName` and `serverFilePath`.
 ** `GOOGLE_DRIVE_SELECT_FOLDER` - Special form that presents a UI from Google Drive, where the user can select a folder (e.g., as a target for uploading files in a subsequent backend step).
 ** `BULK_EDIT_FORM` - For use by the standard QQQ Bulk Edit process.
-** `BULK_LOAD_FILE_MAPPING_FORM`, `BULK_LOAD_VALUE_MAPPING_FORM`, or `BULK_LOAD_PROFILE_FORM` - For use by the standard QQQ Bulk Load process.
 ** `VALIDATION_REVIEW_SCREEN` - For use by the QQQ Streamed ETL With Frontend process family of processes.
 Displays a component prompting the user to run full validation or to skip it, or, if full validation has been ran, then showing the results of that validation.
 ** `PROCESS_SUMMARY_RESULTS` - For use by the QQQ Streamed ETL With Frontend process family of processes.
 Displays the summary results of running the process.
-** `WIDGET` - Render a QQQ Widget.
-Requires that `widgetName` be given as a value for the component.
 ** `RECORD_LIST` - _Deprecated.
 Showed a grid with a list of records as populated by the process._
 * `values` - *Map of String → Serializable* - Key=value pairs, with different expectations based on the component's `type`.
@@ -131,27 +116,6 @@ It can be used, however, for example, to cause a `defaultValue` to be applied to
 It can also be used to cause the process to throw an error, if a field is marked as `isRequired`, but a value is not present.
 ** `recordListMetaData` - *RecordListMetaData object* - _Not used at this time._
 
-==== QStateMachineStep
-
-Processes that use `flow = STATE_MACHINE` should use process steps of type `QStateMachineStep`.
-
-A common pattern seen in state-machine processes, is that they will present a frontend-step to a user,
-then always run a given backend-step in response to that screen which the user submitted.
-Inside that backend-step, custom application logic will determine the next state to go to,
-which is typically another frontend-step (which would then submit data to its corresponding backend-step,
-and continue the FSM).
-
-To help facilitate this pattern, factory methods exist on `QStateMachineStep`,
-for constructing the commonly-expected types of state-machine steps:
-
-* `frontendThenBackend(name, frontendStep, backendStep)` - for the frontend-then-backend pattern described above.
-* `backendOnly(name, backendStep)` - for a state that only has a backend step.
-This might be useful as a “reset” step, to run before restarting a state-loop.
-* `frontendOnly(name, frontendStep)` - for a state that only has a frontend step,
-which would always be followed by another state, which must be specified as the `defaultNextStepName`
-on the `QStateMachineStep`.
-
-
 ==== BasepullConfiguration
 
 A "Basepull" process is a common pattern where an application needs to perform some action on all new (or updated) records from a particular data source.
@@ -226,8 +190,8 @@ To improve this programmer-interface, an inner `Builder` class exists within `St
 
 *StreamedETLWithFrontendProcess.Builder methods:*
 
-* `withName(String name)` - Set the name for the process.
-* `withLabel(String label)` - Set the label for the process.
+* `withName(String name) - Set the name for the process.
+* `withLabel(String label) - Set the label for the process.
 * `withIcon(QIcon icon)` - Set an {link-icon} to be display with the process in the UI.
 * `withExtractStepClass(Class<? extends AbstractExtractStep>)` - Define the Extract step for the process.
 If no special extraction logic is needed, `ExtractViaQuery.class` is often a reasonable default.
@@ -254,10 +218,12 @@ But for some cases, doing page-level transactions can reduce long-transactions a
 * `withSchedule(QScheduleMetaData schedule)` - Add a <<QScheduleMetaData>> to the process.
 
 [#_custom_process_flow]
-==== How to customize a Linear process flow
-As referenced in the definition of the <<_QProcessMetaData_Properties,QProcessMetaData Properties>>, by default,
-(with `flow = LINEAR`) a process will execute each of its steps in-order, as defined in the `stepList` property.
-However, a Backend Step can customize this flow as follows:
+==== Custom Process Flow
+As referenced in the definition of the <<_QProcessMetaData_Properties,QProcessMetaData Properties>>, by default, a process
+will execute each of its steps in-order, as defined in the `stepList` property.
+However, a Backend Step can customize this flow #todo - write more clearly here...
+
+There are generally 2 method to call (in a `BackendStep`) to do a dynamic flow:
 
 * `RunBackendStepOutput.setOverrideLastStepName(String stepName)`
 ** QQQ's `RunProcessAction` keeps track of which step it "last" ran, e.g., to tell it which one to run next.
@@ -273,7 +239,7 @@ does need to be found in the new `stepNameList` - otherwise, the framework will
 for figuring out where to go next.
 
 [source,java]
-.Example of a defining process that can use a customized linear flow:
+.Example of a defining process that can use a flexible flow:
 ----
 // for a case like this, it would be recommended to define all step names in constants:
 public final static String STEP_START = "start";
@@ -358,21 +324,4 @@ public static class StartStep implements BackendStep
 }
 ----
 
-[#_process_back]
-==== How to allow a process to go back
-
-The simplest option to allow a process to present a "Back" button to users,
-thus allowing them to move backward through a process
-(e.g., from a review screen back to an earlier input screen), is to set the property `backStepName`
-on a `QFrontendStepMetaData`.
-
-If the step that is executed after the user hits "Back" is a backend step, then within that
-step, `runBackendStepInput.getIsStepBack()` will return `true` (but ONLY within that first step after
-the user hits "Back").  It may be necessary within individual processes to be aware that the user
-has chosen to go back, to reset certain values in the process's state.
-
-Alternatively, if a frontend step's "Back" behavior needs to be dynamic (e.g., sometimes not available,
-or sometimes targeting different steps in the process), then in a backend step that runs before the
-frontend step, a call to `runBackendStepOutput.getProcessState().setBackStepName()` can be made,
-to customize the value which would otherwise come from the `QFrontendStepMetaData`.
 

docs/metaData/QInstance.adoc

@@ -29,21 +29,11 @@ service.routes(qJavalinImplementation.getRoutes());
 service.start();
 ----
 
-*QInstance Setup:*
+*QBackendMetaData Setup Methods:*
 
 These are the methods that one is most likely to use when setting up (defining) a `QInstance` object:
 
-* `add(TopLevelMetaDataInterface metaData)` - Generic method that takes most of the meta-data subtypes that can be added
-to an instance, such as `QBackendMetaData`, `QTableMetaData`, `QProcessMetaData`, etc.
-There are also type-specific methods (e.g., `addTable`, `addProcess`, etc), which one can call instead - this would just
-be a matter of personal preference.
+* asdf
 
-*QInstance Usage:*
+*QBackendMetaData Usage Methods:*
 
-Generally you will set up a `QInstance` in your application's startup flow, and then place it in the server (e.g., javalin).
-But, if, during application-code runtime, you need access to any of the meta-data in the instance, you access it
-via the `QContext` object's static `getInstance()` method.  This can be useful, for example, to get a list of the defined
-tables in the application, or fields in a table, or details about a field, etc.
-
-It is generally considered risky and/or not a good idea at all to modify the `QInstance` after it has been validated and
-a server is running.  Future versions of QQQ may in fact restrict modifications to the instance after validation.

docs/misc/ProcessBackendSteps.adoc

@@ -128,15 +128,15 @@ These steps are:
 ** The Extract step is called before the Preview, Validate, and Result screens, though for the Preview screen, it is set to only extract a small number of records (10).
 * *Transform* - a subclass of `AbstractTransformStep` - is responsible for applying the majority of the business logic of the process.
 In ETL terminology, this is the "Transform" action - which means applying some type of logical transformation an input record (found by the Extract step) to generate an output record (stored by the Load step).
-** A Transform step's `runOnePage` method will be called, potentially, multiple times, each time with a page of records in the `runBackendStepInput` parameter.
+** A Transform step's `run` method will be called, potentially, multiple times, each time with a page of records in the `runBackendStepInput` parameter.
 ** This method is responsible for adding records to the `runBackendStepOutput`, which will then be passed to the *Load* step.
 ** This class is also responsible for implementing the method `getProcessSummary`, which provides the data to the *Validate* screen.
-** The `runOnePage` method will generally update ProcessSummaryLine objects to facilitate this functionality.
+** The run method will generally update ProcessSummaryLine objects to facilitate this functionality.
 ** The Transform step is called before the Preview, Validate, and Result screens, consuming all records selected by the Extract step.
 * *Load* - a subclass of `AbstractLoadStep` - is responsible for the Load function of the ETL job.
 _A quick word on terminology - this step is actually doing what we are more likely to think of as storing data - which feels like the opposite of “loading” - but we use the name Load to keep in line with the ETL naming convention…_
 ** The Load step is ONLY called before the Result screen is presented (possibly after Preview, if the user chose to skip validation, otherwise, after validation).
-** Similar to the Transform step, the Load step's `runOnePage` method will be called potentially multiple times, with pages of records in its input.
+** Similar to the Transform step, the Load step's `run` method will be called potentially multiple times, with pages of records in its input.
 ** As such, the Load step is generally the only step where data writes should occur.
 *** e.g., a Transform step should not do any writes, as it will be called when the user is going to the Preview & Validate screens - e.g., before the user confirmed that they want to execute the action!
 ** A common pattern is that the Load step just needs to insert or update the list of records output by the Transform step, in which case the QQQ-provided `LoadViaInsertStep` or `LoadViaUpdateStep` can be used, but custom use-cases can be built as well.

pom.xml

@@ -34,10 +34,8 @@
       <module>qqq-backend-module-api</module>
       <module>qqq-backend-module-filesystem</module>
       <module>qqq-backend-module-rdbms</module>
-      <module>qqq-backend-module-sqlite</module>
       <module>qqq-backend-module-mongodb</module>
       <module>qqq-language-support-javascript</module>
-      <module>qqq-openapi</module>
       <module>qqq-middleware-picocli</module>
       <module>qqq-middleware-javalin</module>
       <module>qqq-middleware-lambda</module>
@@ -48,15 +46,16 @@
    </modules>
 
    <properties>
-      <revision>0.24.0-SNAPSHOT</revision>
+      <revision>0.20.0-SNAPSHOT</revision>
 
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-      <maven.compiler.release>17</maven.compiler.release>
+      <maven.compiler.source>17</maven.compiler.source>
+      <maven.compiler.target>17</maven.compiler.target>
       <maven.compiler.showDeprecation>true</maven.compiler.showDeprecation>
       <maven.compiler.showWarnings>true</maven.compiler.showWarnings>
       <coverage.haltOnFailure>true</coverage.haltOnFailure>
-      <coverage.instructionCoveredRatioMinimum>0.80</coverage.instructionCoveredRatioMinimum>
+      <coverage.instructionCoveredRatioMinimum>0.75</coverage.instructionCoveredRatioMinimum>
       <coverage.classCoveredRatioMinimum>0.95</coverage.classCoveredRatioMinimum>
       <plugin.shade.phase>none</plugin.shade.phase>
    </properties>
@@ -169,7 +168,6 @@
                      <violationSeverity>warning</violationSeverity>
                      <excludes>**/target/generated-sources/*.*</excludes>
                      <!-- <linkXRef>false</linkXRef> -->
-                     <includeTestSourceDirectory>true</includeTestSourceDirectory>
                   </configuration>
                   <goals>
                      <goal>check</goal>
@@ -211,7 +209,6 @@
                   <productionBranch>main</productionBranch>
                   <developmentBranch>dev</developmentBranch>
                   <versionTagPrefix>version-</versionTagPrefix>
-                  <releaseBranchPrefix>rel/</releaseBranchPrefix>
                </gitFlowConfig>
                <skipFeatureVersion>true</skipFeatureVersion> <!-- Keep feature names out of versions -->
                <postReleaseGoals>install</postReleaseGoals>  <!-- Let CI run deploys -->

qodana.yaml

@@ -1,31 +0,0 @@
-#-------------------------------------------------------------------------------#
-#               Qodana analysis is configured by qodana.yaml file               #
-#             https://www.jetbrains.com/help/qodana/qodana-yaml.html            #
-#-------------------------------------------------------------------------------#
-version: "1.0"
-
-#Specify inspection profile for code analysis
-profile:
-  name: qodana.starter
-
-#Enable inspections
-#include:
-#  - name: <SomeEnabledInspectionId>
-
-#Disable inspections
-#exclude:
-#  - name: <SomeDisabledInspectionId>
-#    paths:
-#      - <path/where/not/run/inspection>
-
-projectJDK: 17 #(Applied in CI/CD pipeline)
-
-#Execute shell command before Qodana execution (Applied in CI/CD pipeline)
-#bootstrap: sh ./prepare-qodana.sh
-
-#Install IDE plugins before Qodana execution (Applied in CI/CD pipeline)
-#plugins:
-#  - id: <plugin.id> #(plugin id can be found at https://plugins.jetbrains.com)
-
-#Specify Qodana linter for analysis (Applied in CI/CD pipeline)
-linter: jetbrains/qodana-jvm:latest

qqq-backend-core/pom.xml

@@ -100,12 +100,7 @@
       <dependency>
          <groupId>org.dhatim</groupId>
          <artifactId>fastexcel</artifactId>
-         <version>0.18.4</version>
-      </dependency>
-      <dependency>
-         <groupId>org.dhatim</groupId>
-         <artifactId>fastexcel-reader</artifactId>
-         <version>0.18.4</version>
+         <version>0.12.15</version>
       </dependency>
       <dependency>
          <groupId>org.apache.poi</groupId>
@@ -117,14 +112,6 @@
          <artifactId>poi-ooxml</artifactId>
          <version>5.2.5</version>
       </dependency>
-
-      <!-- adding to help FastExcel -->
-      <dependency>
-         <groupId>commons-io</groupId>
-         <artifactId>commons-io</artifactId>
-         <version>2.16.0</version>
-      </dependency>
-
       <dependency>
          <groupId>com.auth0</groupId>
          <artifactId>auth0</artifactId>

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/QBackendTransaction.java

@@ -37,7 +37,7 @@ import com.kingsrook.qqq.backend.core.modules.backend.QBackendModuleInterface;
  **
  ** Note:  One would imagine that this class shouldn't ever implement Serializable...
  *******************************************************************************/
-public class QBackendTransaction implements AutoCloseable
+public class QBackendTransaction
 {
 
    /*******************************************************************************

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/async/AsyncRecordPipeLoop.java

@@ -32,7 +32,6 @@ import com.kingsrook.qqq.backend.core.logging.QLogger;
 import com.kingsrook.qqq.backend.core.utils.SleepUtils;
 import com.kingsrook.qqq.backend.core.utils.lambdas.UnsafeFunction;
 import com.kingsrook.qqq.backend.core.utils.lambdas.UnsafeSupplier;
-import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
 
 
 /*******************************************************************************
@@ -186,7 +185,8 @@ public class AsyncRecordPipeLoop
 
       if(recordCount > 0)
       {
-         LOG.debug("End of job summary", logPair("recordCount", recordCount), logPair("jobName", jobName), logPair("millis", endTime - jobStartTime), logPair("recordsPerSecond", 1000d * (recordCount / (.001d + (endTime - jobStartTime)))));
+         LOG.info(String.format("Processed %,d records", recordCount)
+            + String.format(" at end of job [%s] in %,d ms (%.2f records/second).", jobName, (endTime - jobStartTime), 1000d * (recordCount / (.001d + (endTime - jobStartTime)))));
       }
 
       return (recordCount);

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/audits/AuditAction.java

@@ -44,7 +44,6 @@ import com.kingsrook.qqq.backend.core.model.actions.tables.get.GetOutput;
 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.security.MultiRecordSecurityLock;
 import com.kingsrook.qqq.backend.core.model.metadata.security.RecordSecurityLock;
 import com.kingsrook.qqq.backend.core.model.metadata.security.RecordSecurityLockFilters;
 import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
@@ -174,49 +173,22 @@ public class AuditAction extends AbstractQActionFunction<AuditInput, AuditOutput
       Map<String, Serializable> securityKeyValues = new HashMap<>();
       for(RecordSecurityLock recordSecurityLock : RecordSecurityLockFilters.filterForReadLocks(CollectionUtils.nonNullList(table.getRecordSecurityLocks())))
       {
-         getRecordSecurityKeyValues(table, record, oldRecord, recordSecurityLock, securityKeyValues);
-      }
-      return securityKeyValues;
-   }
+         Serializable keyValue = record == null ? null : record.getValue(recordSecurityLock.getFieldName());
 
-
-
-   /***************************************************************************
-    ** recursive implementation of getRecordSecurityKeyValues, for dealing with
-    ** multi-locks
-    ***************************************************************************/
-   private static void getRecordSecurityKeyValues(QTableMetaData table, QRecord record, Optional<QRecord> oldRecord, RecordSecurityLock recordSecurityLock, Map<String, Serializable> securityKeyValues)
-   {
-      //////////////////////////////////////////////////////
-      // special case with recursive call for multi-locks //
-      //////////////////////////////////////////////////////
-      if(recordSecurityLock instanceof MultiRecordSecurityLock multiRecordSecurityLock)
-      {
-         for(RecordSecurityLock subLock : RecordSecurityLockFilters.filterForReadLocks(CollectionUtils.nonNullList(multiRecordSecurityLock.getLocks())))
+         if(keyValue == null && oldRecord.isPresent())
          {
-            getRecordSecurityKeyValues(table, record, oldRecord, subLock, securityKeyValues);
+            LOG.debug("Table with a securityLock, but value not found in field", logPair("table", table.getName()), logPair("field", recordSecurityLock.getFieldName()));
+            keyValue = oldRecord.get().getValue(recordSecurityLock.getFieldName());
          }
 
-         return;
+         if(keyValue == null)
+         {
+            LOG.debug("Table with a securityLock, but value not found in field", logPair("table", table.getName()), logPair("field", recordSecurityLock.getFieldName()), logPair("oldRecordIsPresent", oldRecord.isPresent()));
+         }
+
+         securityKeyValues.put(recordSecurityLock.getSecurityKeyType(), keyValue);
       }
-
-      ///////////////////////////////////////////
-      // by default, deal with non-multi locks //
-      ///////////////////////////////////////////
-      Serializable keyValue = record == null ? null : record.getValue(recordSecurityLock.getFieldName());
-
-      if(keyValue == null && oldRecord.isPresent())
-      {
-         LOG.debug("Table with a securityLock, but value not found in field", logPair("table", table.getName()), logPair("field", recordSecurityLock.getFieldName()));
-         keyValue = oldRecord.get().getValue(recordSecurityLock.getFieldName());
-      }
-
-      if(keyValue == null)
-      {
-         LOG.debug("Table with a securityLock, but value not found in field", logPair("table", table.getName()), logPair("field", recordSecurityLock.getFieldName()), logPair("oldRecordIsPresent", oldRecord.isPresent()));
-      }
-
-      securityKeyValues.put(recordSecurityLock.getSecurityKeyType(), keyValue);
+      return securityKeyValues;
    }
 
 
@@ -246,16 +218,15 @@ public class AuditAction extends AbstractQActionFunction<AuditInput, AuditOutput
                   throw (new QException("Requested audit for an unrecognized table name: " + auditSingleInput.getAuditTableName()));
                }
 
-               ///////////////////////////////////////////////////////
-               // validate security keys on the table are given     //
-               // originally, this case threw...                    //
-               // but i think it's better to record the audit, just //
-               // missing its security key value, then to fail...   //
-               // but, maybe should be configurable, etc...         //
-               ///////////////////////////////////////////////////////
-               if(!validateSecurityKeys(auditSingleInput, table))
+               ///////////////////////////////////////////////////
+               // validate security keys on the table are given //
+               ///////////////////////////////////////////////////
+               for(RecordSecurityLock recordSecurityLock : RecordSecurityLockFilters.filterForReadLocks(CollectionUtils.nonNullList(table.getRecordSecurityLocks())))
                {
-                  LOG.debug("Missing securityKeyValue in audit request", logPair("table", auditSingleInput.getAuditTableName()), logPair("auditMessage", auditSingleInput.getMessage()), logPair("recordId", auditSingleInput.getRecordId()));
+                  if(auditSingleInput.getSecurityKeyValues() == null || !auditSingleInput.getSecurityKeyValues().containsKey(recordSecurityLock.getSecurityKeyType()))
+                  {
+                     throw (new QException("Missing securityKeyValue [" + recordSecurityLock.getSecurityKeyType() + "] in audit request for table " + auditSingleInput.getAuditTableName()));
+                  }
                }
 
                ////////////////////////////////////////////////
@@ -301,7 +272,7 @@ public class AuditAction extends AbstractQActionFunction<AuditInput, AuditOutput
             List<QRecord> auditDetailRecords = new ArrayList<>();
             for(AuditSingleInput auditSingleInput : CollectionUtils.nonNullList(input.getAuditSingleInputList()))
             {
-               Long auditId = insertOutput.getRecords().get(i++).getValueLong("id");
+               Integer auditId = insertOutput.getRecords().get(i++).getValueInteger("id");
                if(auditId == null)
                {
                   LOG.warn("Missing an id for inserted audit - so won't be able to store its child details...");
@@ -333,70 +304,6 @@ public class AuditAction extends AbstractQActionFunction<AuditInput, AuditOutput
 
 
 
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   static boolean validateSecurityKeys(AuditSingleInput auditSingleInput, QTableMetaData table)
-   {
-      boolean allAreValid = true;
-      for(RecordSecurityLock recordSecurityLock : RecordSecurityLockFilters.filterForReadLocks(CollectionUtils.nonNullList(table.getRecordSecurityLocks())))
-      {
-         boolean lockIsValid = validateSecurityKeysForLock(auditSingleInput, recordSecurityLock);
-         if(!lockIsValid)
-         {
-            allAreValid = false;
-         }
-      }
-
-      return (allAreValid);
-   }
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   private static boolean validateSecurityKeysForLock(AuditSingleInput auditSingleInput, RecordSecurityLock recordSecurityLock)
-   {
-      if(recordSecurityLock instanceof MultiRecordSecurityLock multiRecordSecurityLock)
-      {
-         boolean allSubLocksAreValid = true;
-         boolean anySubLocksAreValid = false;
-         for(RecordSecurityLock lock : RecordSecurityLockFilters.filterForReadLocks(CollectionUtils.nonNullList(multiRecordSecurityLock.getLocks())))
-         {
-            boolean subLockIsValid = validateSecurityKeysForLock(auditSingleInput, lock);
-            if(subLockIsValid)
-            {
-               anySubLocksAreValid = true;
-            }
-            else
-            {
-               allSubLocksAreValid = false;
-            }
-         }
-
-         if(multiRecordSecurityLock.getOperator().equals(MultiRecordSecurityLock.BooleanOperator.OR))
-         {
-            return (anySubLocksAreValid);
-         }
-         else if(multiRecordSecurityLock.getOperator().equals(MultiRecordSecurityLock.BooleanOperator.AND))
-         {
-            return (allSubLocksAreValid);
-         }
-      }
-      else
-      {
-         if(auditSingleInput.getSecurityKeyValues() == null || !auditSingleInput.getSecurityKeyValues().containsKey(recordSecurityLock.getSecurityKeyType()))
-         {
-            return (false);
-         }
-      }
-
-      return (true);
-   }
-
-
-
    /*******************************************************************************
     **
     *******************************************************************************/

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/automation/RecordAutomationStatusUpdater.java

@@ -344,9 +344,6 @@ public class RecordAutomationStatusUpdater
 
 
 
-   /***************************************************************************
-    **
-    ***************************************************************************/
    private record Key(QTableMetaData table, TriggerEvent triggerEvent) {}
 
 }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/customizers/AbstractPreInsertCustomizer.java

@@ -55,10 +55,10 @@ public abstract class AbstractPreInsertCustomizer implements TableCustomizerInte
 
 
 
-   /***************************************************************************
-    ** allow the customizer to specify when it should be executed as part of the
-    ** insert action.  default (per method in this class) is AFTER_ALL_VALIDATIONS
-    ***************************************************************************/
+   /////////////////////////////////////////////////////////////////////////////////
+   // allow the customizer to specify when it should be executed as part of the   //
+   // insert action.  default (per method in this class) is AFTER_ALL_VALIDATIONS //
+   /////////////////////////////////////////////////////////////////////////////////
    public enum WhenToRun
    {
       BEFORE_ALL_VALIDATIONS,

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/customizers/ChildInserterPostInsertCustomizer.java

@@ -28,7 +28,6 @@ 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;
@@ -50,9 +49,6 @@ import com.kingsrook.qqq.backend.core.utils.CollectionUtils;
  *******************************************************************************/
 public abstract class ChildInserterPostInsertCustomizer extends AbstractPostInsertCustomizer
 {
-   /***************************************************************************
-    **
-    ***************************************************************************/
    public enum RelationshipType
    {
       PARENT_POINTS_AT_CHILD,
@@ -101,7 +97,7 @@ public abstract class ChildInserterPostInsertCustomizer extends AbstractPostInse
          List<QRecord>  rs               = records;
          List<QRecord>  childrenToInsert = new ArrayList<>();
          QTableMetaData table            = getInsertInput().getTable();
-         QTableMetaData childTable       = QContext.getQInstance().getTable(getChildTableName());
+         QTableMetaData childTable       = getInsertInput().getInstance().getTable(getChildTableName());
 
          ////////////////////////////////////////////////////////////////////////////////
          // iterate over the inserted records, building a list child records to insert //

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/customizers/RecordCustomizerUtilityInterface.java

@@ -24,12 +24,10 @@ package com.kingsrook.qqq.backend.core.actions.customizers;
 
 import java.io.Serializable;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import com.kingsrook.qqq.backend.core.context.QContext;
 import com.kingsrook.qqq.backend.core.logging.QLogger;
-import com.kingsrook.qqq.backend.core.model.actions.tables.update.UpdateInput;
 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;
@@ -145,19 +143,4 @@ public interface RecordCustomizerUtilityInterface
       }
    }
 
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   default Map<Serializable, QRecord> getOldRecordMap(List<QRecord> oldRecordList, UpdateInput updateInput)
-   {
-      Map<Serializable, QRecord> oldRecordMap = new HashMap<>();
-      for(QRecord qRecord : oldRecordList)
-      {
-         oldRecordMap.put(qRecord.getValue(updateInput.getTable().getPrimaryKeyField()), qRecord);
-      }
-
-      return (oldRecordMap);
-   }
-
 }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/customizers/TableCustomizerInterface.java

@@ -22,19 +22,15 @@
 package com.kingsrook.qqq.backend.core.actions.customizers;
 
 
-import java.io.Serializable;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import com.kingsrook.qqq.backend.core.exceptions.QException;
 import com.kingsrook.qqq.backend.core.logging.QLogger;
-import com.kingsrook.qqq.backend.core.model.actions.AbstractActionInput;
 import com.kingsrook.qqq.backend.core.model.actions.tables.QueryOrGetInputInterface;
 import com.kingsrook.qqq.backend.core.model.actions.tables.delete.DeleteInput;
 import com.kingsrook.qqq.backend.core.model.actions.tables.insert.InsertInput;
 import com.kingsrook.qqq.backend.core.model.actions.tables.update.UpdateInput;
 import com.kingsrook.qqq.backend.core.model.data.QRecord;
-import com.kingsrook.qqq.backend.core.utils.CollectionUtils;
 import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
 
 
@@ -51,6 +47,7 @@ public interface TableCustomizerInterface
 {
    QLogger LOG = QLogger.getLogger(TableCustomizerInterface.class);
 
+
    /*******************************************************************************
     ** custom actions to run after a query (or get!) takes place.
     **
@@ -80,15 +77,8 @@ public interface TableCustomizerInterface
     *******************************************************************************/
    default List<QRecord> preInsert(InsertInput insertInput, List<QRecord> records, boolean isPreview) throws QException
    {
-      try
-      {
-         return (preInsertOrUpdate(insertInput, records, isPreview, Optional.empty()));
-      }
-      catch(NotImplementedHereException e)
-      {
-         LOG.info("A default implementation of preInsert is running...  Probably not expected!", logPair("tableName", insertInput.getTableName()));
-         return (records);
-      }
+      LOG.info("A default implementation of preInsert is running...  Probably not expected!", logPair("tableName", insertInput.getTableName()));
+      return (records);
    }
 
 
@@ -114,15 +104,8 @@ public interface TableCustomizerInterface
     *******************************************************************************/
    default List<QRecord> postInsert(InsertInput insertInput, List<QRecord> records) throws QException
    {
-      try
-      {
-         return (postInsertOrUpdate(insertInput, records, Optional.empty()));
-      }
-      catch(NotImplementedHereException e)
-      {
-         LOG.info("A default implementation of postInsert is running...  Probably not expected!", logPair("tableName", insertInput.getTableName()));
-         return (records);
-      }
+      LOG.info("A default implementation of postInsert is running...  Probably not expected!", logPair("tableName", insertInput.getTableName()));
+      return (records);
    }
 
 
@@ -147,15 +130,8 @@ public interface TableCustomizerInterface
     *******************************************************************************/
    default List<QRecord> preUpdate(UpdateInput updateInput, List<QRecord> records, boolean isPreview, Optional<List<QRecord>> oldRecordList) throws QException
    {
-      try
-      {
-         return (preInsertOrUpdate(updateInput, records, isPreview, oldRecordList));
-      }
-      catch(NotImplementedHereException e)
-      {
-         LOG.info("A default implementation of preUpdate is running...  Probably not expected!", logPair("tableName", updateInput.getTableName()));
-         return (records);
-      }
+      LOG.info("A default implementation of preUpdate is running...  Probably not expected!", logPair("tableName", updateInput.getTableName()));
+      return (records);
    }
 
 
@@ -175,15 +151,8 @@ public interface TableCustomizerInterface
     *******************************************************************************/
    default List<QRecord> postUpdate(UpdateInput updateInput, List<QRecord> records, Optional<List<QRecord>> oldRecordList) throws QException
    {
-      try
-      {
-         return (postInsertOrUpdate(updateInput, records, oldRecordList));
-      }
-      catch(NotImplementedHereException e)
-      {
-         LOG.info("A default implementation of postUpdate is running...  Probably not expected!", logPair("tableName", updateInput.getTableName()));
-         return (records);
-      }
+      LOG.info("A default implementation of postUpdate is running...  Probably not expected!", logPair("tableName", updateInput.getTableName()));
+      return (records);
    }
 
 
@@ -230,59 +199,4 @@ public interface TableCustomizerInterface
       return (records);
    }
 
-
-   /***************************************************************************
-    ** Optional method to override in a customizer that does the same thing for
-    ** both preInsert & preUpdate.
-    ***************************************************************************/
-   default List<QRecord> preInsertOrUpdate(AbstractActionInput input, List<QRecord> records, boolean isPreview, Optional<List<QRecord>> oldRecordList) throws QException
-   {
-      throw NotImplementedHereException.instance;
-   }
-
-
-   /***************************************************************************
-    ** Optional method to override in a customizer that does the same thing for
-    ** both postInsert & postUpdate.
-    ***************************************************************************/
-   default List<QRecord> postInsertOrUpdate(AbstractActionInput input, List<QRecord> records, Optional<List<QRecord>> oldRecordList) throws QException
-   {
-      throw NotImplementedHereException.instance;
-   }
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   default Optional<Map<Serializable, QRecord>> oldRecordListToMap(String primaryKeyField, Optional<List<QRecord>> oldRecordList)
-   {
-      if(oldRecordList.isPresent())
-      {
-         return (Optional.of(CollectionUtils.listToMap(oldRecordList.get(), r -> r.getValue(primaryKeyField))));
-      }
-      else
-      {
-         return (Optional.empty());
-      }
-   }
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   class NotImplementedHereException extends QException
-   {
-      private static NotImplementedHereException instance = new NotImplementedHereException();
-
-
-
-      /***************************************************************************
-       **
-       ***************************************************************************/
-      private NotImplementedHereException()
-      {
-         super("Not implemented here");
-      }
-   }
 }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/widgets/AbstractWidgetRenderer.java

@@ -31,7 +31,6 @@ 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;
@@ -103,7 +102,7 @@ public abstract class AbstractWidgetRenderer
             String possibleValueSourceName = dropdownData.getPossibleValueSourceName();
             if(possibleValueSourceName != null)
             {
-               QPossibleValueSource possibleValueSource = QContext.getQInstance().getPossibleValueSource(possibleValueSourceName);
+               QPossibleValueSource possibleValueSource = input.getInstance().getPossibleValueSource(possibleValueSourceName);
 
                /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
                // this looks complicated, but is just look for a label in the dropdown data and if found use it,                                                                                  //

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/widgets/ChildRecordListRenderer.java

@@ -34,11 +34,8 @@ 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.instances.QInstanceValidator;
-import com.kingsrook.qqq.backend.core.instances.validation.plugins.QInstanceValidatorPluginInterface;
 import com.kingsrook.qqq.backend.core.logging.QLogger;
 import com.kingsrook.qqq.backend.core.model.actions.tables.count.CountInput;
 import com.kingsrook.qqq.backend.core.model.actions.tables.get.GetInput;
@@ -53,15 +50,12 @@ import com.kingsrook.qqq.backend.core.model.actions.widgets.RenderWidgetOutput;
 import com.kingsrook.qqq.backend.core.model.dashboard.widgets.ChildRecordListData;
 import com.kingsrook.qqq.backend.core.model.dashboard.widgets.WidgetType;
 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.dashboard.AbstractWidgetMetaDataBuilder;
 import com.kingsrook.qqq.backend.core.model.metadata.dashboard.QWidgetMetaData;
-import com.kingsrook.qqq.backend.core.model.metadata.dashboard.QWidgetMetaDataInterface;
 import com.kingsrook.qqq.backend.core.model.metadata.joins.JoinOn;
 import com.kingsrook.qqq.backend.core.model.metadata.joins.QJoinMetaData;
 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.JsonUtils;
 import com.kingsrook.qqq.backend.core.utils.StringUtils;
 import com.kingsrook.qqq.backend.core.utils.ValueUtils;
@@ -88,9 +82,7 @@ public class ChildRecordListRenderer extends AbstractWidgetRenderer
          .withIsCard(true)
          .withCodeReference(new QCodeReference(ChildRecordListRenderer.class))
          .withType(WidgetType.CHILD_RECORD_LIST.getType())
-         .withDefaultValue("joinName", join.getName())
-         .withValidatorPlugin(new ChildRecordListWidgetValidator())
-      ));
+         .withDefaultValue("joinName", join.getName())));
    }
 
 
@@ -175,7 +167,6 @@ public class ChildRecordListRenderer extends AbstractWidgetRenderer
          widgetMetaData.withDefaultValue("manageAssociationName", manageAssociationName);
          return (this);
       }
-
    }
 
 
@@ -190,10 +181,10 @@ public class ChildRecordListRenderer extends AbstractWidgetRenderer
       {
          String         widgetLabel = input.getQueryParams().get("widgetLabel");
          String         joinName    = input.getQueryParams().get("joinName");
-         QJoinMetaData  join        = QContext.getQInstance().getJoin(joinName);
+         QJoinMetaData  join        = input.getInstance().getJoin(joinName);
          String         id          = input.getQueryParams().get("id");
-         QTableMetaData leftTable   = QContext.getQInstance().getTable(join.getLeftTable());
-         QTableMetaData rightTable  = QContext.getQInstance().getTable(join.getRightTable());
+         QTableMetaData leftTable   = input.getInstance().getTable(join.getLeftTable());
+         QTableMetaData rightTable  = input.getInstance().getTable(join.getRightTable());
 
          Integer maxRows = null;
          if(StringUtils.hasContent(input.getQueryParams().get("maxRows")))
@@ -202,7 +193,7 @@ public class ChildRecordListRenderer extends AbstractWidgetRenderer
          }
          else if(input.getWidgetMetaData().getDefaultValues().containsKey("maxRows"))
          {
-            maxRows = ValueUtils.getValueAsInteger(input.getWidgetMetaData().getDefaultValues().get("maxRows"));
+            maxRows = ValueUtils.getValueAsInteger(input.getWidgetMetaData().getDefaultValues().containsKey("maxRows"));
          }
 
          //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -261,7 +252,7 @@ public class ChildRecordListRenderer extends AbstractWidgetRenderer
             }
          }
 
-         String tablePath   = QContext.getQInstance().getTablePath(rightTable.getName());
+         String tablePath   = input.getInstance().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);
@@ -287,9 +278,7 @@ public class ChildRecordListRenderer extends AbstractWidgetRenderer
             Map<String, Serializable> widgetValues = input.getWidgetMetaData().getDefaultValues();
             if(widgetValues.containsKey("disabledFieldsForNewChildRecords"))
             {
-               @SuppressWarnings("unchecked")
-               Set<String> disabledFieldsForNewChildRecords = (Set<String>) widgetValues.get("disabledFieldsForNewChildRecords");
-               widgetData.setDisabledFieldsForNewChildRecords(disabledFieldsForNewChildRecords);
+               widgetData.setDisabledFieldsForNewChildRecords((Set<String>) widgetValues.get("disabledFieldsForNewChildRecords"));
             }
             else
             {
@@ -307,18 +296,8 @@ public class ChildRecordListRenderer extends AbstractWidgetRenderer
                   }
                }
             }
-
-            if(widgetValues.containsKey("defaultValuesForNewChildRecordsFromParentFields"))
-            {
-               @SuppressWarnings("unchecked")
-               Map<String, String> defaultValuesForNewChildRecordsFromParentFields = (Map<String, String>) widgetValues.get("defaultValuesForNewChildRecordsFromParentFields");
-               widgetData.setDefaultValuesForNewChildRecordsFromParentFields(defaultValuesForNewChildRecordsFromParentFields);
-            }
          }
 
-         widgetData.setAllowRecordEdit(BooleanUtils.isTrue(ValueUtils.getValueAsBoolean(input.getQueryParams().get("allowRecordEdit"))));
-         widgetData.setAllowRecordDelete(BooleanUtils.isTrue(ValueUtils.getValueAsBoolean(input.getQueryParams().get("allowRecordDelete"))));
-
          return (new RenderWidgetOutput(widgetData));
       }
       catch(Exception e)
@@ -328,68 +307,4 @@ public class ChildRecordListRenderer extends AbstractWidgetRenderer
       }
    }
 
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   private static class ChildRecordListWidgetValidator implements QInstanceValidatorPluginInterface<QWidgetMetaDataInterface>
-   {
-
-      /***************************************************************************
-       **
-       ***************************************************************************/
-      @Override
-      public void validate(QWidgetMetaDataInterface widgetMetaData, QInstance qInstance, QInstanceValidator qInstanceValidator)
-      {
-         String prefix = "Widget " + widgetMetaData.getName() + ": ";
-
-         //////////////////////////////////
-         // make sure join name is given //
-         //////////////////////////////////
-         String joinName = ValueUtils.getValueAsString(CollectionUtils.nonNullMap(widgetMetaData.getDefaultValues()).get("joinName"));
-         if(qInstanceValidator.assertCondition(StringUtils.hasContent(joinName), prefix + "defaultValue for joinName must be given"))
-         {
-            ///////////////////////////
-            // make sure join exists //
-            ///////////////////////////
-            QJoinMetaData join = qInstance.getJoin(joinName);
-            if(qInstanceValidator.assertCondition(join != null, prefix + "No join named " + joinName + " exists in the instance"))
-            {
-               //////////////////////////////////////////////////////////////////////////////////
-               // if there's a manageAssociationName, make sure the table has that association //
-               //////////////////////////////////////////////////////////////////////////////////
-               String manageAssociationName = ValueUtils.getValueAsString(widgetMetaData.getDefaultValues().get("manageAssociationName"));
-               if(StringUtils.hasContent(manageAssociationName))
-               {
-                  validateAssociationName(prefix, manageAssociationName, join, qInstance, qInstanceValidator);
-               }
-            }
-         }
-      }
-
-
-
-      /***************************************************************************
-       **
-       ***************************************************************************/
-      private void validateAssociationName(String prefix, String manageAssociationName, QJoinMetaData join, QInstance qInstance, QInstanceValidator qInstanceValidator)
-      {
-         ///////////////////////////////////
-         // make sure join's table exists //
-         ///////////////////////////////////
-         QTableMetaData table = qInstance.getTable(join.getLeftTable());
-         if(table == null)
-         {
-            qInstanceValidator.getErrors().add(prefix + "Unable to validate manageAssociationName, as table [" + join.getLeftTable() + "] on left-side table of join [" + join.getName() + "] does not exist.");
-         }
-         else
-         {
-            if(CollectionUtils.nonNullList(table.getAssociations()).stream().noneMatch(a -> manageAssociationName.equals(a.getName())))
-            {
-               qInstanceValidator.getErrors().add(prefix + "an association named [" + manageAssociationName + "] does not exist on table [" + join.getLeftTable() + "]");
-            }
-         }
-      }
-   }
 }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/widgets/ProcessAlertWidget.java

@@ -23,11 +23,11 @@ package com.kingsrook.qqq.backend.core.actions.dashboard.widgets;
 
 
 import com.kingsrook.qqq.backend.core.exceptions.QException;
+import com.kingsrook.qqq.backend.core.model.MetaDataProducerInterface;
 import com.kingsrook.qqq.backend.core.model.actions.widgets.RenderWidgetInput;
 import com.kingsrook.qqq.backend.core.model.actions.widgets.RenderWidgetOutput;
 import com.kingsrook.qqq.backend.core.model.dashboard.widgets.AlertData;
 import com.kingsrook.qqq.backend.core.model.dashboard.widgets.WidgetType;
-import com.kingsrook.qqq.backend.core.model.metadata.MetaDataProducerInterface;
 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.dashboard.QWidgetMetaData;
@@ -40,9 +40,9 @@ import com.kingsrook.qqq.backend.core.model.metadata.dashboard.QWidgetMetaData;
  ** - alertType - name of entry in AlertType enum (ERROR, WARNING, SUCCESS)
  ** - alertHtml - html to display inside the alert (other than its icon)
  *******************************************************************************/
-public class AlertWidgetRenderer extends AbstractWidgetRenderer implements MetaDataProducerInterface<QWidgetMetaData>
+public class ProcessAlertWidget extends AbstractWidgetRenderer implements MetaDataProducerInterface<QWidgetMetaData>
 {
-   public static final String NAME = "AlertWidgetRenderer";
+   public static final String NAME = "ProcessAlertWidget";
 
 
 

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/dashboard/widgets/ProcessWidgetRenderer.java

@@ -24,7 +24,6 @@ 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;
@@ -58,7 +57,7 @@ public class ProcessWidgetRenderer extends AbstractWidgetRenderer
             setupDropdowns(input, widgetMetaData, data);
 
             String           processName     = (String) widgetMetaData.getDefaultValues().get(WIDGET_PROCESS_NAME);
-            QProcessMetaData processMetaData = QContext.getQInstance().getProcess(processName);
+            QProcessMetaData processMetaData = input.getInstance().getProcess(processName);
             data.setProcessMetaData(processMetaData);
 
             data.setDefaultValues(new HashMap<>(input.getQueryParams()));

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/metadata/AllowAllMetaDataFilter.java

@@ -1,92 +0,0 @@
-/*
- * QQQ - Low-code Application Framework for Engineers.
- * Copyright (C) 2021-2024.  Kingsrook, LLC
- * 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States
- * contact@kingsrook.com
- * https://github.com/Kingsrook/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.kingsrook.qqq.backend.core.actions.metadata;
-
-
-import com.kingsrook.qqq.backend.core.model.actions.metadata.MetaDataInput;
-import com.kingsrook.qqq.backend.core.model.metadata.dashboard.QWidgetMetaDataInterface;
-import com.kingsrook.qqq.backend.core.model.metadata.layout.QAppMetaData;
-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;
-
-
-/*******************************************************************************
- ** a default implementation of MetaDataFilterInterface, that allows all the things
- *******************************************************************************/
-public class AllowAllMetaDataFilter implements MetaDataFilterInterface
-{
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   @Override
-   public boolean allowTable(MetaDataInput input, QTableMetaData table)
-   {
-      return (true);
-   }
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   @Override
-   public boolean allowProcess(MetaDataInput input, QProcessMetaData process)
-   {
-      return (true);
-   }
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   @Override
-   public boolean allowReport(MetaDataInput input, QReportMetaData report)
-   {
-      return (true);
-   }
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   @Override
-   public boolean allowApp(MetaDataInput input, QAppMetaData app)
-   {
-      return (true);
-   }
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   @Override
-   public boolean allowWidget(MetaDataInput input, QWidgetMetaDataInterface widget)
-   {
-      return (true);
-   }
-
-}

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/metadata/MetaDataAction.java

@@ -28,18 +28,12 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import com.kingsrook.qqq.backend.core.actions.ActionHelper;
-import com.kingsrook.qqq.backend.core.actions.customizers.QCodeLoader;
 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.exceptions.QRuntimeException;
-import com.kingsrook.qqq.backend.core.logging.QLogger;
 import com.kingsrook.qqq.backend.core.model.actions.metadata.MetaDataInput;
 import com.kingsrook.qqq.backend.core.model.actions.metadata.MetaDataOutput;
 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.code.QCodeReference;
 import com.kingsrook.qqq.backend.core.model.metadata.dashboard.QWidgetMetaDataInterface;
 import com.kingsrook.qqq.backend.core.model.metadata.frontend.AppTreeNode;
 import com.kingsrook.qqq.backend.core.model.metadata.frontend.QFrontendAppMetaData;
@@ -54,7 +48,6 @@ 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.utils.CollectionUtils;
-import com.kingsrook.qqq.backend.core.utils.memoization.Memoization;
 
 
 /*******************************************************************************
@@ -63,12 +56,6 @@ import com.kingsrook.qqq.backend.core.utils.memoization.Memoization;
  *******************************************************************************/
 public class MetaDataAction
 {
-   private static final QLogger LOG = QLogger.getLogger(MetaDataAction.class);
-
-   private static Memoization<QInstance, MetaDataFilterInterface> metaDataFilterMemoization = new Memoization<>();
-
-
-
    /*******************************************************************************
     **
     *******************************************************************************/
@@ -76,33 +63,28 @@ public class MetaDataAction
    {
       ActionHelper.validateSession(metaDataInput);
 
-      MetaDataOutput           metaDataOutput = new MetaDataOutput();
-      Map<String, AppTreeNode> treeNodes      = new LinkedHashMap<>();
+      // todo pre-customization - just get to modify the request?
+      MetaDataOutput metaDataOutput = new MetaDataOutput();
 
-      MetaDataFilterInterface filter = getMetaDataFilter();
+      Map<String, AppTreeNode> treeNodes = new LinkedHashMap<>();
 
       /////////////////////////////////////
       // map tables to frontend metadata //
       /////////////////////////////////////
       Map<String, QFrontendTableMetaData> tables = new LinkedHashMap<>();
-      for(Map.Entry<String, QTableMetaData> entry : QContext.getQInstance().getTables().entrySet())
+      for(Map.Entry<String, QTableMetaData> entry : metaDataInput.getInstance().getTables().entrySet())
       {
          String         tableName = entry.getKey();
          QTableMetaData table     = entry.getValue();
 
-         if(!filter.allowTable(metaDataInput, table))
-         {
-            continue;
-         }
-
          PermissionCheckResult permissionResult = PermissionsHelper.getPermissionCheckResult(metaDataInput, table);
          if(permissionResult.equals(PermissionCheckResult.DENY_HIDE))
          {
             continue;
          }
 
-         QBackendMetaData backendForTable = QContext.getQInstance().getBackendForTable(tableName);
-         tables.put(tableName, new QFrontendTableMetaData(metaDataInput, backendForTable, table, false, false));
+         QBackendMetaData backendForTable = metaDataInput.getInstance().getBackendForTable(tableName);
+         tables.put(tableName, new QFrontendTableMetaData(backendForTable, table, false, false));
          treeNodes.put(tableName, new AppTreeNode(table));
       }
       metaDataOutput.setTables(tables);
@@ -114,16 +96,11 @@ public class MetaDataAction
       // map processes to frontend metadata //
       ////////////////////////////////////////
       Map<String, QFrontendProcessMetaData> processes = new LinkedHashMap<>();
-      for(Map.Entry<String, QProcessMetaData> entry : QContext.getQInstance().getProcesses().entrySet())
+      for(Map.Entry<String, QProcessMetaData> entry : metaDataInput.getInstance().getProcesses().entrySet())
       {
          String           processName = entry.getKey();
          QProcessMetaData process     = entry.getValue();
 
-         if(!filter.allowProcess(metaDataInput, process))
-         {
-            continue;
-         }
-
          PermissionCheckResult permissionResult = PermissionsHelper.getPermissionCheckResult(metaDataInput, process);
          if(permissionResult.equals(PermissionCheckResult.DENY_HIDE))
          {
@@ -139,16 +116,11 @@ public class MetaDataAction
       // map reports to frontend metadata //
       //////////////////////////////////////
       Map<String, QFrontendReportMetaData> reports = new LinkedHashMap<>();
-      for(Map.Entry<String, QReportMetaData> entry : QContext.getQInstance().getReports().entrySet())
+      for(Map.Entry<String, QReportMetaData> entry : metaDataInput.getInstance().getReports().entrySet())
       {
          String          reportName = entry.getKey();
          QReportMetaData report     = entry.getValue();
 
-         if(!filter.allowReport(metaDataInput, report))
-         {
-            continue;
-         }
-
          PermissionCheckResult permissionResult = PermissionsHelper.getPermissionCheckResult(metaDataInput, report);
          if(permissionResult.equals(PermissionCheckResult.DENY_HIDE))
          {
@@ -164,16 +136,11 @@ public class MetaDataAction
       // map widgets to frontend metadata //
       //////////////////////////////////////
       Map<String, QFrontendWidgetMetaData> widgets = new LinkedHashMap<>();
-      for(Map.Entry<String, QWidgetMetaDataInterface> entry : QContext.getQInstance().getWidgets().entrySet())
+      for(Map.Entry<String, QWidgetMetaDataInterface> entry : metaDataInput.getInstance().getWidgets().entrySet())
       {
          String                   widgetName = entry.getKey();
          QWidgetMetaDataInterface widget     = entry.getValue();
 
-         if(!filter.allowWidget(metaDataInput, widget))
-         {
-            continue;
-         }
-
          PermissionCheckResult permissionResult = PermissionsHelper.getPermissionCheckResult(metaDataInput, widget);
          if(permissionResult.equals(PermissionCheckResult.DENY_HIDE))
          {
@@ -187,7 +154,7 @@ public class MetaDataAction
       ///////////////////////////////////////////////////////
       // sort apps - by sortOrder (integer), then by label //
       ///////////////////////////////////////////////////////
-      List<QAppMetaData> sortedApps = QContext.getQInstance().getApps().values().stream()
+      List<QAppMetaData> sortedApps = metaDataInput.getInstance().getApps().values().stream()
          .sorted(Comparator.comparing((QAppMetaData a) -> a.getSortOrder())
             .thenComparing((QAppMetaData a) -> a.getLabel()))
          .toList();
@@ -206,19 +173,9 @@ public class MetaDataAction
             continue;
          }
 
-         if(!filter.allowApp(metaDataInput, app))
-         {
-            continue;
-         }
+         apps.put(appName, new QFrontendAppMetaData(app, metaDataOutput));
+         treeNodes.put(appName, new AppTreeNode(app));
 
-         //////////////////////////////////////
-         // build the frontend-app meta-data //
-         //////////////////////////////////////
-         QFrontendAppMetaData frontendAppMetaData = new QFrontendAppMetaData(app, metaDataOutput);
-
-         /////////////////////////////////////////
-         // add children (if they're permitted) //
-         /////////////////////////////////////////
          if(CollectionUtils.nullSafeHasContents(app.getChildren()))
          {
             for(QAppChildMetaData child : app.getChildren())
@@ -232,42 +189,9 @@ public class MetaDataAction
                   }
                }
 
-               //////////////////////////////////////////////////////////////////////////////////////////////////////
-               // if the child was filtered away, so it isn't in its corresponding map, then don't include it here //
-               //////////////////////////////////////////////////////////////////////////////////////////////////////
-               if(child instanceof QTableMetaData table && !tables.containsKey(table.getName()))
-               {
-                  continue;
-               }
-               if(child instanceof QProcessMetaData process && !processes.containsKey(process.getName()))
-               {
-                  continue;
-               }
-               if(child instanceof QReportMetaData report && !reports.containsKey(report.getName()))
-               {
-                  continue;
-               }
-               if(child instanceof QAppMetaData childApp && !apps.containsKey(childApp.getName()))
-               {
-                  // continue;
-               }
-
-               frontendAppMetaData.addChild(new AppTreeNode(child));
+               apps.get(appName).addChild(new AppTreeNode(child));
             }
          }
-
-         //////////////////////////////////////////////////////////////////////////////////////////////////////
-         // if the app ended up having no children, then discard it                                          //
-         // todo - i think this was wrong, because it didn't take into account ... something nested maybe... //
-         //////////////////////////////////////////////////////////////////////////////////////////////////////
-         if(CollectionUtils.nullSafeIsEmpty(frontendAppMetaData.getChildren()) && CollectionUtils.nullSafeIsEmpty(frontendAppMetaData.getWidgets()))
-         {
-            // LOG.debug("Discarding empty app", logPair("name", frontendAppMetaData.getName()));
-            // continue;
-         }
-
-         apps.put(appName, frontendAppMetaData);
-         treeNodes.put(appName, new AppTreeNode(app));
       }
       metaDataOutput.setApps(apps);
 
@@ -287,14 +211,14 @@ public class MetaDataAction
       ////////////////////////////////////
       // add branding metadata if found //
       ////////////////////////////////////
-      if(QContext.getQInstance().getBranding() != null)
+      if(metaDataInput.getInstance().getBranding() != null)
       {
-         metaDataOutput.setBranding(QContext.getQInstance().getBranding());
+         metaDataOutput.setBranding(metaDataInput.getInstance().getBranding());
       }
 
-      metaDataOutput.setEnvironmentValues(QContext.getQInstance().getEnvironmentValues());
+      metaDataOutput.setEnvironmentValues(metaDataInput.getInstance().getEnvironmentValues());
 
-      metaDataOutput.setHelpContents(QContext.getQInstance().getHelpContent());
+      metaDataOutput.setHelpContents(metaDataInput.getInstance().getHelpContent());
 
       // todo post-customization - can do whatever w/ the result if you want?
 
@@ -303,33 +227,6 @@ public class MetaDataAction
 
 
 
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   private MetaDataFilterInterface getMetaDataFilter()
-   {
-      return metaDataFilterMemoization.getResult(QContext.getQInstance(), i ->
-      {
-         MetaDataFilterInterface filter                  = null;
-         QCodeReference          metaDataFilterReference = QContext.getQInstance().getMetaDataFilter();
-         if(metaDataFilterReference != null)
-         {
-            filter = QCodeLoader.getAdHoc(MetaDataFilterInterface.class, metaDataFilterReference);
-            LOG.debug("Using new meta-data filter of type: " + filter.getClass().getSimpleName());
-         }
-
-         if(filter == null)
-         {
-            filter = new AllowAllMetaDataFilter();
-            LOG.debug("Using new default (allow-all) meta-data filter");
-         }
-
-         return (filter);
-      }).orElseThrow(() -> new QRuntimeException("Error getting metaDataFilter"));
-   }
-
-
-
    /*******************************************************************************
     **
     *******************************************************************************/

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/metadata/MetaDataFilterInterface.java

@@ -1,64 +0,0 @@
-/*
- * QQQ - Low-code Application Framework for Engineers.
- * Copyright (C) 2021-2024.  Kingsrook, LLC
- * 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States
- * contact@kingsrook.com
- * https://github.com/Kingsrook/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.kingsrook.qqq.backend.core.actions.metadata;
-
-
-import com.kingsrook.qqq.backend.core.model.actions.metadata.MetaDataInput;
-import com.kingsrook.qqq.backend.core.model.metadata.dashboard.QWidgetMetaDataInterface;
-import com.kingsrook.qqq.backend.core.model.metadata.layout.QAppMetaData;
-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;
-
-
-/*******************************************************************************
- **
- *******************************************************************************/
-public interface MetaDataFilterInterface
-{
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   boolean allowTable(MetaDataInput input, QTableMetaData table);
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   boolean allowProcess(MetaDataInput input, QProcessMetaData process);
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   boolean allowReport(MetaDataInput input, QReportMetaData report);
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   boolean allowApp(MetaDataInput input, QAppMetaData app);
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   boolean allowWidget(MetaDataInput input, QWidgetMetaDataInterface widget);
-
-}

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/metadata/ProcessMetaDataAction.java

@@ -23,7 +23,6 @@ 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;
@@ -48,7 +47,7 @@ public class ProcessMetaDataAction
       // todo pre-customization - just get to modify the request?
       ProcessMetaDataOutput processMetaDataOutput = new ProcessMetaDataOutput();
 
-      QProcessMetaData process = QContext.getQInstance().getProcess(processMetaDataInput.getProcessName());
+      QProcessMetaData process = processMetaDataInput.getInstance().getProcess(processMetaDataInput.getProcessName());
       if(process == null)
       {
          throw (new QNotFoundException("Process [" + processMetaDataInput.getProcessName() + "] was not found."));

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/metadata/TableMetaDataAction.java

@@ -23,7 +23,6 @@ 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;
@@ -49,13 +48,13 @@ public class TableMetaDataAction
       // todo pre-customization - just get to modify the request?
       TableMetaDataOutput tableMetaDataOutput = new TableMetaDataOutput();
 
-      QTableMetaData table = QContext.getQInstance().getTable(tableMetaDataInput.getTableName());
+      QTableMetaData table = tableMetaDataInput.getInstance().getTable(tableMetaDataInput.getTableName());
       if(table == null)
       {
          throw (new QNotFoundException("Table [" + tableMetaDataInput.getTableName() + "] was not found."));
       }
-      QBackendMetaData backendForTable = QContext.getQInstance().getBackendForTable(table.getName());
-      tableMetaDataOutput.setTable(new QFrontendTableMetaData(tableMetaDataInput, backendForTable, table, true, true));
+      QBackendMetaData backendForTable = tableMetaDataInput.getInstance().getBackendForTable(table.getName());
+      tableMetaDataOutput.setTable(new QFrontendTableMetaData(backendForTable, table, true, true));
 
       // todo post-customization - can do whatever w/ the result if you want
 

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/permissions/PermissionsHelper.java

@@ -49,7 +49,6 @@ 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.model.session.QSession;
 import com.kingsrook.qqq.backend.core.utils.StringUtils;
-import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
 
 
 /*******************************************************************************
@@ -66,7 +65,7 @@ public class PermissionsHelper
     *******************************************************************************/
    public static void checkTablePermissionThrowing(AbstractTableActionInput tableActionInput, TablePermissionSubType permissionSubType) throws QPermissionDeniedException
    {
-      checkTablePermissionThrowing(tableActionInput, tableActionInput.getTableName(), permissionSubType);
+      checkTablePermissionThrowing(tableActionInput.getTableName(), permissionSubType);
    }
 
 
@@ -74,17 +73,11 @@ public class PermissionsHelper
    /*******************************************************************************
     **
     *******************************************************************************/
-   private static void checkTablePermissionThrowing(AbstractActionInput actionInput, String tableName, TablePermissionSubType permissionSubType) throws QPermissionDeniedException
+   private static void checkTablePermissionThrowing(String tableName, TablePermissionSubType permissionSubType) throws QPermissionDeniedException
    {
       warnAboutPermissionSubTypeForTables(permissionSubType);
       QTableMetaData table = QContext.getQInstance().getTable(tableName);
 
-      if(table == null)
-      {
-         LOG.info("Throwing a permission denied exception in response to a non-existent table name", logPair("tableName", tableName));
-         throw (new QPermissionDeniedException("Permission denied."));
-      }
-
       commonCheckPermissionThrowing(getEffectivePermissionRules(table, QContext.getQInstance()), permissionSubType, table.getName());
    }
 
@@ -106,11 +99,11 @@ public class PermissionsHelper
    /*******************************************************************************
     **
     *******************************************************************************/
-   public static boolean hasTablePermission(AbstractActionInput actionInput, String tableName, TablePermissionSubType permissionSubType)
+   public static boolean hasTablePermission(String tableName, TablePermissionSubType permissionSubType)
    {
       try
       {
-         checkTablePermissionThrowing(actionInput, tableName, permissionSubType);
+         checkTablePermissionThrowing(tableName, permissionSubType);
          return (true);
       }
       catch(QPermissionDeniedException e)
@@ -191,14 +184,7 @@ public class PermissionsHelper
     *******************************************************************************/
    public static void checkProcessPermissionThrowing(AbstractActionInput actionInput, String processName, Map<String, Serializable> processValues) throws QPermissionDeniedException
    {
-      QProcessMetaData process = QContext.getQInstance().getProcess(processName);
-
-      if(process == null)
-      {
-         LOG.info("Throwing a permission denied exception in response to a non-existent process name", logPair("processName", processName));
-         throw (new QPermissionDeniedException("Permission denied."));
-      }
-
+      QProcessMetaData process                  = QContext.getQInstance().getProcess(processName);
       QPermissionRules effectivePermissionRules = getEffectivePermissionRules(process, QContext.getQInstance());
 
       if(effectivePermissionRules.getCustomPermissionChecker() != null)
@@ -240,13 +226,6 @@ public class PermissionsHelper
    public static void checkAppPermissionThrowing(AbstractActionInput actionInput, String appName) throws QPermissionDeniedException
    {
       QAppMetaData app = QContext.getQInstance().getApp(appName);
-
-      if(app == null)
-      {
-         LOG.info("Throwing a permission denied exception in response to a non-existent app name", logPair("appName", appName));
-         throw (new QPermissionDeniedException("Permission denied."));
-      }
-
       commonCheckPermissionThrowing(getEffectivePermissionRules(app, QContext.getQInstance()), PrivatePermissionSubType.HAS_ACCESS, app.getName());
    }
 
@@ -276,13 +255,6 @@ public class PermissionsHelper
    public static void checkReportPermissionThrowing(AbstractActionInput actionInput, String reportName) throws QPermissionDeniedException
    {
       QReportMetaData report = QContext.getQInstance().getReport(reportName);
-
-      if(report == null)
-      {
-         LOG.info("Throwing a permission denied exception in response to a non-existent process name", logPair("reportName", reportName));
-         throw (new QPermissionDeniedException("Permission denied."));
-      }
-
       commonCheckPermissionThrowing(getEffectivePermissionRules(report, QContext.getQInstance()), PrivatePermissionSubType.HAS_ACCESS, report.getName());
    }
 
@@ -312,13 +284,6 @@ public class PermissionsHelper
    public static void checkWidgetPermissionThrowing(AbstractActionInput actionInput, String widgetName) throws QPermissionDeniedException
    {
       QWidgetMetaDataInterface widget = QContext.getQInstance().getWidget(widgetName);
-
-      if(widget == null)
-      {
-         LOG.info("Throwing a permission denied exception in response to a non-existent widget name", logPair("widgetName", widgetName));
-         throw (new QPermissionDeniedException("Permission denied."));
-      }
-
       commonCheckPermissionThrowing(getEffectivePermissionRules(widget, QContext.getQInstance()), PrivatePermissionSubType.HAS_ACCESS, widget.getName());
    }
 

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/processes/CancelProcessAction.java

@@ -25,7 +25,6 @@ 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;
@@ -55,7 +54,7 @@ public class CancelProcessAction extends RunProcessAction
    {
       ActionHelper.validateSession(runProcessInput);
 
-      QProcessMetaData process = QContext.getQInstance().getProcess(runProcessInput.getProcessName());
+      QProcessMetaData process = runProcessInput.getInstance().getProcess(runProcessInput.getProcessName());
       if(process == null)
       {
          throw new QBadRequestException("Process [" + runProcessInput.getProcessName() + "] is not defined in this instance.");

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/processes/RunBackendStepAction.java

@@ -30,7 +30,6 @@ 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;
@@ -40,7 +39,6 @@ import com.kingsrook.qqq.backend.core.model.actions.tables.query.QQueryFilter;
 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.metadata.code.QCodeReference;
-import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeReferenceLambda;
 import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.processes.QBackendStepMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.processes.QFunctionInputMetaData;
@@ -66,7 +64,7 @@ public class RunBackendStepAction
    {
       ActionHelper.validateSession(runBackendStepInput);
 
-      QProcessMetaData process = QContext.getQInstance().getProcess(runBackendStepInput.getProcessName());
+      QProcessMetaData process = runBackendStepInput.getInstance().getProcess(runBackendStepInput.getProcessName());
       if(process == null)
       {
          throw new QException("Process [" + runBackendStepInput.getProcessName() + "] is not defined in this instance.");
@@ -258,20 +256,11 @@ public class RunBackendStepAction
       {
          runBackendStepOutput.seedFromRequest(runBackendStepInput);
 
-         Object codeObject;
-         if(code instanceof QCodeReferenceLambda<?> qCodeReferenceLambda)
-         {
-            codeObject = qCodeReferenceLambda.getLambda();
-         }
-         else
-         {
-            Class<?> codeClass = Class.forName(code.getName());
-            codeObject = codeClass.getConstructor().newInstance();
-         }
-
+         Class<?> codeClass  = Class.forName(code.getName());
+         Object   codeObject = codeClass.getConstructor().newInstance();
          if(!(codeObject instanceof BackendStep backendStepCodeObject))
          {
-            throw (new QException("The supplied codeReference [" + code + "] is not a reference to a BackendStep"));
+            throw (new QException("The supplied code [" + codeClass.getName() + "] is not an instance of BackendStep"));
          }
 
          backendStepCodeObject.run(runBackendStepInput, runBackendStepOutput);

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/processes/RunProcessAction.java

@@ -28,11 +28,9 @@ import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
 import com.kingsrook.qqq.backend.core.actions.ActionHelper;
-import com.kingsrook.qqq.backend.core.actions.customizers.QCodeLoader;
 import com.kingsrook.qqq.backend.core.actions.dashboard.widgets.NoCodeWidgetRenderer;
 import com.kingsrook.qqq.backend.core.actions.tables.InsertAction;
 import com.kingsrook.qqq.backend.core.actions.tables.QueryAction;
@@ -54,18 +52,15 @@ import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryOutput;
 import com.kingsrook.qqq.backend.core.model.actions.tables.update.UpdateInput;
 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.code.QCodeReference;
 import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.processes.NoCodeWidgetFrontendComponentMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.processes.QBackendStepMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.processes.QFrontendComponentMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.processes.QFrontendStepMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.processes.QProcessMetaData;
-import com.kingsrook.qqq.backend.core.model.metadata.processes.QStateMachineStep;
 import com.kingsrook.qqq.backend.core.model.metadata.processes.QStepMetaData;
 import com.kingsrook.qqq.backend.core.model.session.QSession;
 import com.kingsrook.qqq.backend.core.processes.implementations.basepull.BasepullConfiguration;
-import com.kingsrook.qqq.backend.core.processes.tracing.ProcessTracerInterface;
 import com.kingsrook.qqq.backend.core.state.InMemoryStateProvider;
 import com.kingsrook.qqq.backend.core.state.StateProviderInterface;
 import com.kingsrook.qqq.backend.core.state.StateType;
@@ -74,7 +69,6 @@ import com.kingsrook.qqq.backend.core.utils.CollectionUtils;
 import com.kingsrook.qqq.backend.core.utils.StringUtils;
 import com.kingsrook.qqq.backend.core.utils.ValueUtils;
 import org.apache.commons.lang.BooleanUtils;
-import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
 
 
 /*******************************************************************************
@@ -85,22 +79,17 @@ public class RunProcessAction
 {
    private static final QLogger LOG = QLogger.getLogger(RunProcessAction.class);
 
-   public static final String BASEPULL_KEY_VALUE        = "basepullKeyValue";
    public static final String BASEPULL_THIS_RUNTIME_KEY = "basepullThisRuntimeKey";
    public static final String BASEPULL_LAST_RUNTIME_KEY = "basepullLastRuntimeKey";
    public static final String BASEPULL_TIMESTAMP_FIELD  = "basepullTimestampField";
    public static final String BASEPULL_CONFIGURATION    = "basepullConfiguration";
 
-   public static final String PROCESS_TRACER_CODE_REFERENCE_FIELD = "processTracerCodeReference";
-
    ////////////////////////////////////////////////////////////////////////////////////////////////
    // indicator that the timestamp field should be updated - e.g., the execute step is finished. //
    ////////////////////////////////////////////////////////////////////////////////////////////////
    public static final String BASEPULL_READY_TO_UPDATE_TIMESTAMP_FIELD = "basepullReadyToUpdateTimestamp";
    public static final String BASEPULL_DID_QUERY_USING_TIMESTAMP_FIELD = "basepullDidQueryUsingTimestamp";
 
-   private ProcessTracerInterface processTracer;
-
 
 
    /*******************************************************************************
@@ -110,7 +99,7 @@ public class RunProcessAction
    {
       ActionHelper.validateSession(runProcessInput);
 
-      QProcessMetaData process = QContext.getQInstance().getProcess(runProcessInput.getProcessName());
+      QProcessMetaData process = runProcessInput.getInstance().getProcess(runProcessInput.getProcessName());
       if(process == null)
       {
          throw new QException("Process [" + runProcessInput.getProcessName() + "] is not defined in this instance.");
@@ -127,17 +116,9 @@ public class RunProcessAction
       }
       runProcessOutput.setProcessUUID(runProcessInput.getProcessUUID());
 
-      traceStartOrResume(runProcessInput, process);
-
       UUIDAndTypeStateKey stateKey     = new UUIDAndTypeStateKey(UUID.fromString(runProcessInput.getProcessUUID()), StateType.PROCESS_STATUS);
       ProcessState        processState = primeProcessState(runProcessInput, stateKey, process);
 
-      /////////////////////////////////////////////////////////////////////////////////////////////////////////////
-      // these should always be clear when we're starting a run - so make sure they haven't leaked from previous //
-      /////////////////////////////////////////////////////////////////////////////////////////////////////////////
-      processState.clearNextStepName();
-      processState.clearBackStepName();
-
       /////////////////////////////////////////////////////////
       // if process is 'basepull' style, keep track of 'now' //
       /////////////////////////////////////////////////////////
@@ -152,11 +133,90 @@ public class RunProcessAction
 
       try
       {
-         switch(Objects.requireNonNull(process.getStepFlow(), "Process [" + process.getName() + "] has a null stepFlow."))
+         String lastStepName = runProcessInput.getStartAfterStep();
+
+         STEP_LOOP:
+         while(true)
          {
-            case LINEAR -> runLinearStepLoop(process, processState, stateKey, runProcessInput, runProcessOutput);
-            case STATE_MACHINE -> runStateMachineStep(runProcessInput.getStartAfterStep(), process, processState, stateKey, runProcessInput, runProcessOutput, 0);
-            default -> throw (new QException("Unhandled process step flow: " + process.getStepFlow()));
+            ///////////////////////////////////////////////////////////////////////////////////////////////////////
+            // always refresh the step list - as any step that runs can modify it (in the process state).        //
+            // this is why we don't do a loop over the step list - as we'd get ConcurrentModificationExceptions. //
+            ///////////////////////////////////////////////////////////////////////////////////////////////////////
+            List<QStepMetaData> stepList = getAvailableStepList(processState, process, lastStepName);
+            if(stepList.isEmpty())
+            {
+               break;
+            }
+
+            QStepMetaData step = stepList.get(0);
+            lastStepName = step.getName();
+
+            if(step instanceof QFrontendStepMetaData frontendStep)
+            {
+               ////////////////////////////////////////////////////////////////
+               // Handle what to do with frontend steps, per request setting //
+               ////////////////////////////////////////////////////////////////
+               switch(runProcessInput.getFrontendStepBehavior())
+               {
+                  case BREAK ->
+                  {
+                     LOG.trace("Breaking process [" + process.getName() + "] at frontend step (as requested by caller): " + step.getName());
+                     processFrontendStepFieldDefaultValues(processState, frontendStep);
+                     processFrontendComponents(processState, frontendStep);
+                     processState.setNextStepName(step.getName());
+                     break STEP_LOOP;
+                  }
+                  case SKIP ->
+                  {
+                     LOG.trace("Skipping frontend step [" + step.getName() + "] in process [" + process.getName() + "] (as requested by caller)");
+
+                     //////////////////////////////////////////////////////////////////////
+                     // much less error prone in case this code changes in the future... //
+                     //////////////////////////////////////////////////////////////////////
+                     // noinspection UnnecessaryContinue
+                     continue;
+                  }
+                  case FAIL ->
+                  {
+                     LOG.trace("Throwing error for frontend step [" + step.getName() + "] in process [" + process.getName() + "] (as requested by caller)");
+                     throw (new QException("Failing process at step " + step.getName() + " (as requested, to fail on frontend steps)"));
+                  }
+                  default -> throw new IllegalStateException("Unexpected value: " + runProcessInput.getFrontendStepBehavior());
+               }
+            }
+            else if(step instanceof QBackendStepMetaData backendStepMetaData)
+            {
+               ///////////////////////
+               // Run backend steps //
+               ///////////////////////
+               LOG.debug("Running backend step [" + step.getName() + "] in process [" + process.getName() + "]");
+               RunBackendStepOutput runBackendStepOutput = runBackendStep(runProcessInput, process, runProcessOutput, stateKey, backendStepMetaData, process, processState);
+
+               /////////////////////////////////////////////////////////////////////////////////////////
+               // if the step returned an override lastStepName, use that to determine how we proceed //
+               /////////////////////////////////////////////////////////////////////////////////////////
+               if(runBackendStepOutput.getOverrideLastStepName() != null)
+               {
+                  LOG.debug("Process step [" + lastStepName + "] returned an overrideLastStepName [" + runBackendStepOutput.getOverrideLastStepName() + "]!");
+                  lastStepName = runBackendStepOutput.getOverrideLastStepName();
+               }
+
+               /////////////////////////////////////////////////////////////////////////////////////////////
+               // similarly, if the step produced an updatedFrontendStepList, propagate that data outward //
+               /////////////////////////////////////////////////////////////////////////////////////////////
+               if(runBackendStepOutput.getUpdatedFrontendStepList() != null)
+               {
+                  LOG.debug("Process step [" + lastStepName + "] generated an updatedFrontendStepList [" + runBackendStepOutput.getUpdatedFrontendStepList().stream().map(s -> s.getName()).toList() + "]!");
+                  runProcessOutput.setUpdatedFrontendStepList(runBackendStepOutput.getUpdatedFrontendStepList());
+               }
+            }
+            else
+            {
+               //////////////////////////////////////////////////
+               // in case we have a different step type, throw //
+               //////////////////////////////////////////////////
+               throw (new QException("Unsure how to run a step of type: " + step.getClass().getName()));
+            }
          }
 
          ///////////////////////////////////////////////////////////////////////////
@@ -176,7 +236,6 @@ public class RunProcessAction
          ////////////////////////////////////////////////////////////
          // upon exception (e.g., one thrown by a step), throw it. //
          ////////////////////////////////////////////////////////////
-         traceBreakOrFinish(runProcessInput, runProcessOutput, qe);
          throw (qe);
       }
       catch(Exception e)
@@ -184,7 +243,6 @@ public class RunProcessAction
          ////////////////////////////////////////////////////////////
          // upon exception (e.g., one thrown by a step), throw it. //
          ////////////////////////////////////////////////////////////
-         traceBreakOrFinish(runProcessInput, runProcessOutput, e);
          throw (new QException("Error running process", e));
       }
       finally
@@ -195,317 +253,11 @@ public class RunProcessAction
          runProcessOutput.setProcessState(processState);
       }
 
-      traceBreakOrFinish(runProcessInput, runProcessOutput, null);
-
       return (runProcessOutput);
    }
 
 
 
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   private void runLinearStepLoop(QProcessMetaData process, ProcessState processState, UUIDAndTypeStateKey stateKey, RunProcessInput runProcessInput, RunProcessOutput runProcessOutput) throws Exception
-   {
-      String lastStepName = runProcessInput.getStartAfterStep();
-      String startAtStep  = runProcessInput.getStartAtStep();
-
-      while(true)
-      {
-         ///////////////////////////////////////////////////////////////////////////////////////////////////////
-         // always refresh the step list - as any step that runs can modify it (in the process state).        //
-         // this is why we don't do a loop over the step list - as we'd get ConcurrentModificationExceptions. //
-         // deal with if we were told, from the input, to start After a step, or start At a step.             //
-         ///////////////////////////////////////////////////////////////////////////////////////////////////////
-         List<QStepMetaData> stepList;
-         if(startAtStep == null)
-         {
-            stepList = getAvailableStepList(processState, process, lastStepName, false);
-         }
-         else
-         {
-            stepList = getAvailableStepList(processState, process, startAtStep, true);
-
-            ///////////////////////////////////////////////////////////////////////////////////
-            // clear this field - so after we run a step, we'll then loop in last-step mode. //
-            ///////////////////////////////////////////////////////////////////////////////////
-            startAtStep = null;
-
-            ///////////////////////////////////////////////////////////////////////////////////
-            // if we're going to run a backend step now, let it see that this is a step-back //
-            ///////////////////////////////////////////////////////////////////////////////////
-            processState.setIsStepBack(true);
-         }
-
-         if(stepList.isEmpty())
-         {
-            break;
-         }
-
-         QStepMetaData step = stepList.get(0);
-         lastStepName = step.getName();
-
-         if(step instanceof QFrontendStepMetaData frontendStep)
-         {
-            LoopTodo loopTodo = prepareForFrontendStep(runProcessInput, process, frontendStep, processState);
-            if(loopTodo == LoopTodo.BREAK)
-            {
-               break;
-            }
-         }
-         else if(step instanceof QBackendStepMetaData backendStepMetaData)
-         {
-            RunBackendStepOutput runBackendStepOutput = runBackendStep(process, processState, stateKey, runProcessInput, runProcessOutput, backendStepMetaData, step);
-
-            /////////////////////////////////////////////////////////////////////////////////////////
-            // if the step returned an override lastStepName, use that to determine how we proceed //
-            /////////////////////////////////////////////////////////////////////////////////////////
-            if(runBackendStepOutput.getOverrideLastStepName() != null)
-            {
-               LOG.debug("Process step [" + lastStepName + "] returned an overrideLastStepName [" + runBackendStepOutput.getOverrideLastStepName() + "]!");
-               lastStepName = runBackendStepOutput.getOverrideLastStepName();
-            }
-         }
-         else
-         {
-            //////////////////////////////////////////////////
-            // in case we have a different step type, throw //
-            //////////////////////////////////////////////////
-            throw (new QException("Unsure how to run a step of type: " + step.getClass().getName()));
-         }
-
-         ////////////////////////////////////////////////////////////////////////////////////////
-         // only let this value be set for the original back step - don't let it stick around. //
-         // if a process wants to keep track of this itself, it can, but in a different slot.  //
-         ////////////////////////////////////////////////////////////////////////////////////////
-         processState.setIsStepBack(false);
-      }
-
-      ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-      // in case we broke from the loop above (e.g., by going directly into a frontend step), once again make sure to lower this flag. //
-      ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-      processState.setIsStepBack(false);
-   }
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   private enum LoopTodo
-   {
-      BREAK,
-      CONTINUE
-   }
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   private LoopTodo prepareForFrontendStep(RunProcessInput runProcessInput, QProcessMetaData process, QFrontendStepMetaData step, ProcessState processState) throws QException
-   {
-      ////////////////////////////////////////////////////////////////
-      // Handle what to do with frontend steps, per request setting //
-      ////////////////////////////////////////////////////////////////
-      switch(runProcessInput.getFrontendStepBehavior())
-      {
-         case BREAK ->
-         {
-            LOG.trace("Breaking process [" + process.getName() + "] at frontend step (as requested by caller): " + step.getName());
-            processFrontendStepFieldDefaultValues(processState, step);
-            processFrontendComponents(processState, step);
-            processState.setNextStepName(step.getName());
-
-            if(StringUtils.hasContent(step.getBackStepName()) && processState.getBackStepName().isEmpty())
-            {
-               processState.setBackStepName(step.getBackStepName());
-            }
-
-            return LoopTodo.BREAK;
-         }
-         case SKIP ->
-         {
-            LOG.trace("Skipping frontend step [" + step.getName() + "] in process [" + process.getName() + "] (as requested by caller)");
-            return LoopTodo.CONTINUE;
-         }
-         case FAIL ->
-         {
-            LOG.trace("Throwing error for frontend step [" + step.getName() + "] in process [" + process.getName() + "] (as requested by caller)");
-            throw (new QException("Failing process at step " + step.getName() + " (as requested, to fail on frontend steps)"));
-         }
-         default -> throw new IllegalStateException("Unexpected value: " + runProcessInput.getFrontendStepBehavior());
-      }
-   }
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   private void runStateMachineStep(String lastStepName, QProcessMetaData process, ProcessState processState, UUIDAndTypeStateKey stateKey, RunProcessInput runProcessInput, RunProcessOutput runProcessOutput, int stackDepth) throws Exception
-   {
-      //////////////////////////////
-      // check for stack-overflow //
-      //////////////////////////////
-      Integer maxStateMachineProcessStepFlowStackDepth = Objects.requireNonNullElse(runProcessInput.getValueInteger("maxStateMachineProcessStepFlowStackDepth"), 20);
-      if(stackDepth > maxStateMachineProcessStepFlowStackDepth)
-      {
-         throw (new QException("StateMachine process recurred too many times (exceeded maxStateMachineProcessStepFlowStackDepth of " + maxStateMachineProcessStepFlowStackDepth + ")"));
-      }
-
-      //////////////////////////////////
-      // figure out what step to run: //
-      //////////////////////////////////
-      QStepMetaData step = null;
-      if(!StringUtils.hasContent(lastStepName))
-      {
-         ////////////////////////////////////////////////////////////////////
-         // if no lastStepName is given, start at the process's first step //
-         ////////////////////////////////////////////////////////////////////
-         if(CollectionUtils.nullSafeIsEmpty(process.getStepList()))
-         {
-            throw (new QException("Process [" + process.getName() + "] does not have a step list defined."));
-         }
-         step = process.getStepList().get(0);
-      }
-      else
-      {
-         /////////////////////////////////////
-         // else run the given lastStepName //
-         /////////////////////////////////////
-         processState.clearNextStepName();
-         processState.clearBackStepName();
-         step = process.getStep(lastStepName);
-         if(step == null)
-         {
-            throw (new QException("Could not find step by name [" + lastStepName + "]"));
-         }
-      }
-
-      /////////////////////////////////////////////////////////////////////////
-      // for the flow of:                                                    //
-      // we were on a frontend step (as a sub-step of a state machine step), //
-      // and now we're here to run that state-step's backend step -          //
-      // find the state-machine step containing this frontend step.          //
-      /////////////////////////////////////////////////////////////////////////
-      String skipSubStepsUntil = null;
-      if(step instanceof QFrontendStepMetaData frontendStepMetaData)
-      {
-         QStateMachineStep stateMachineStep = getStateMachineStepContainingSubStep(process, frontendStepMetaData.getName());
-         if(stateMachineStep == null)
-         {
-            throw (new QException("Could not find stateMachineStep that contains last-frontend step: " + frontendStepMetaData.getName()));
-         }
-         step = stateMachineStep;
-
-         //////////////////////////////////////////////////////////////////////////////////
-         // set this flag, to know to skip this frontend step in the sub-step loop below //
-         //////////////////////////////////////////////////////////////////////////////////
-         skipSubStepsUntil = frontendStepMetaData.getName();
-      }
-
-      if(!(step instanceof QStateMachineStep stateMachineStep))
-      {
-         throw (new QException("Have a non-stateMachineStep in a process using stateMachine flow... " + step.getClass().getName()));
-      }
-
-      ///////////////////////
-      // run the sub-steps //
-      ///////////////////////
-      boolean ranAnySubSteps = false;
-      for(QStepMetaData subStep : stateMachineStep.getSubSteps())
-      {
-         ///////////////////////////////////////////////////////////////////////////////////////////////
-         // ok, well, skip them if this flag is set (and clear the flag once we've hit this sub-step) //
-         ///////////////////////////////////////////////////////////////////////////////////////////////
-         if(skipSubStepsUntil != null)
-         {
-            if(skipSubStepsUntil.equals(subStep.getName()))
-            {
-               skipSubStepsUntil = null;
-            }
-            continue;
-         }
-
-         ranAnySubSteps = true;
-         if(subStep instanceof QFrontendStepMetaData frontendStep)
-         {
-            LoopTodo loopTodo = prepareForFrontendStep(runProcessInput, process, frontendStep, processState);
-            if(loopTodo == LoopTodo.BREAK)
-            {
-               return;
-            }
-         }
-         else if(subStep instanceof QBackendStepMetaData backendStepMetaData)
-         {
-            RunBackendStepOutput runBackendStepOutput = runBackendStep(process, processState, stateKey, runProcessInput, runProcessOutput, backendStepMetaData, step);
-            Optional<String>     nextStepName         = runBackendStepOutput.getProcessState().getNextStepName();
-
-            if(nextStepName.isEmpty() && StringUtils.hasContent(stateMachineStep.getDefaultNextStepName()))
-            {
-               nextStepName = Optional.of(stateMachineStep.getDefaultNextStepName());
-            }
-
-            if(nextStepName.isPresent())
-            {
-               //////////////////////////////////////////////////////////////////////////////////////////////////////
-               // if we've been given a next-step-name, go to that step now.                                       //
-               // it might be a backend-only stateMachineStep, in which case, we should run that backend step now. //
-               // or it might be a frontend-then-backend step, in which case, we want to go to that frontend step. //
-               // if we weren't given a next-step-name, then we should stay in the same state - either to finish   //
-               // its sub-steps, or, to fall out of the loop and end the process.                                  //
-               //////////////////////////////////////////////////////////////////////////////////////////////////////
-               processState.clearNextStepName();
-               processState.clearBackStepName();
-               runStateMachineStep(nextStepName.get(), process, processState, stateKey, runProcessInput, runProcessOutput, stackDepth + 1);
-               return;
-            }
-         }
-         else
-         {
-            //////////////////////////////////////////////////
-            // in case we have a different step type, throw //
-            //////////////////////////////////////////////////
-            throw (new QException("Unsure how to run a step of type: " + step.getClass().getName()));
-         }
-      }
-
-      if(!ranAnySubSteps)
-      {
-         if(StringUtils.hasContent(stateMachineStep.getDefaultNextStepName()))
-         {
-            runStateMachineStep(stateMachineStep.getDefaultNextStepName(), process, processState, stateKey, runProcessInput, runProcessOutput, stackDepth + 1);
-         }
-      }
-   }
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   public QStateMachineStep getStateMachineStepContainingSubStep(QProcessMetaData process, String stepName)
-   {
-      for(QStepMetaData step : process.getAllSteps().values())
-      {
-         if(step instanceof QStateMachineStep stateMachineStep)
-         {
-            for(QStepMetaData subStep : stateMachineStep.getSubSteps())
-            {
-               if(subStep.getName().equals(stepName))
-               {
-                  return (stateMachineStep);
-               }
-            }
-         }
-      }
-
-      return (null);
-   }
-
-
-
    /*******************************************************************************
     **
     *******************************************************************************/
@@ -583,12 +335,12 @@ public class RunProcessAction
          ///////////////////////////////////////////////////
          runProcessInput.seedFromProcessState(optionalProcessState.get());
 
-         /////////////////////////////////////////////////////////////////////////////////////////////////////
-         // if we're restoring an old state, we can discard a previously stored processMetaDataAdjustment - //
-         // it is only needed on the transitional edge from a backend-step to a frontend step, but not      //
-         // in the other directly                                                                           //
-         /////////////////////////////////////////////////////////////////////////////////////////////////////
-         optionalProcessState.get().setProcessMetaDataAdjustment(null);
+         ///////////////////////////////////////////////////////////////////////////////////////////////////
+         // if we're restoring an old state, we can discard a previously stored updatedFrontendStepList - //
+         // it is only needed on the transitional edge from a backend-step to a frontend step, but not    //
+         // in the other directly                                                                         //
+         ///////////////////////////////////////////////////////////////////////////////////////////////////
+         optionalProcessState.get().setUpdatedFrontendStepList(null);
 
          ///////////////////////////////////////////////////////////////////////////
          // if there were values from the caller, put those (back) in the request //
@@ -603,40 +355,16 @@ public class RunProcessAction
       }
 
       ProcessState processState = optionalProcessState.get();
+      processState.clearNextStepName();
       return processState;
    }
 
 
 
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   private RunBackendStepOutput runBackendStep(QProcessMetaData process, ProcessState processState, UUIDAndTypeStateKey stateKey, RunProcessInput runProcessInput, RunProcessOutput runProcessOutput, QBackendStepMetaData backendStepMetaData, QStepMetaData step) throws Exception
-   {
-      ///////////////////////
-      // Run backend steps //
-      ///////////////////////
-      LOG.debug("Running backend step [" + step.getName() + "] in process [" + process.getName() + "]");
-      RunBackendStepOutput runBackendStepOutput = runBackendStep(runProcessInput, process, runProcessOutput, stateKey, backendStepMetaData, process, processState);
-
-      //////////////////////////////////////////////////////////////////////////////////////////////
-      // similarly, if the step produced a processMetaDataAdjustment, propagate that data outward //
-      //////////////////////////////////////////////////////////////////////////////////////////////
-      if(runBackendStepOutput.getProcessMetaDataAdjustment() != null)
-      {
-         LOG.debug("Process step [" + step.getName() + "] generated a ProcessMetaDataAdjustment [" + runBackendStepOutput.getProcessMetaDataAdjustment() + "]!");
-         runProcessOutput.setProcessMetaDataAdjustment(runBackendStepOutput.getProcessMetaDataAdjustment());
-      }
-
-      return runBackendStepOutput;
-   }
-
-
-
    /*******************************************************************************
     ** Run a single backend step.
     *******************************************************************************/
-   RunBackendStepOutput runBackendStep(RunProcessInput runProcessInput, QProcessMetaData process, RunProcessOutput runProcessOutput, UUIDAndTypeStateKey stateKey, QBackendStepMetaData backendStep, QProcessMetaData qProcessMetaData, ProcessState processState) throws Exception
+   protected RunBackendStepOutput runBackendStep(RunProcessInput runProcessInput, QProcessMetaData process, RunProcessOutput runProcessOutput, UUIDAndTypeStateKey stateKey, QBackendStepMetaData backendStep, QProcessMetaData qProcessMetaData, ProcessState processState) throws Exception
    {
       RunBackendStepInput runBackendStepInput = new RunBackendStepInput(processState);
       runBackendStepInput.setProcessName(process.getName());
@@ -644,7 +372,6 @@ public class RunProcessAction
       runBackendStepInput.setCallback(runProcessInput.getCallback());
       runBackendStepInput.setFrontendStepBehavior(runProcessInput.getFrontendStepBehavior());
       runBackendStepInput.setAsyncJobCallback(runProcessInput.getAsyncJobCallback());
-      runBackendStepInput.setProcessTracer(processTracer);
 
       runBackendStepInput.setTableName(process.getTableName());
       if(!StringUtils.hasContent(runBackendStepInput.getTableName()))
@@ -666,13 +393,9 @@ public class RunProcessAction
          runBackendStepInput.setBasepullLastRunTime((Instant) runProcessInput.getValues().get(BASEPULL_LAST_RUNTIME_KEY));
       }
 
-      traceStepStart(runBackendStepInput);
-
       RunBackendStepOutput runBackendStepOutput = new RunBackendStepAction().execute(runBackendStepInput);
       storeState(stateKey, runBackendStepOutput.getProcessState());
 
-      traceStepFinish(runBackendStepInput, runBackendStepOutput);
-
       if(runBackendStepOutput.getException() != null)
       {
          runProcessOutput.setException(runBackendStepOutput.getException());
@@ -686,10 +409,8 @@ public class RunProcessAction
 
    /*******************************************************************************
     ** Get the list of steps which are eligible to run.
-    **
-    ** lastStep will be included in the list, or not, based on includeLastStep.
     *******************************************************************************/
-   static List<QStepMetaData> getAvailableStepList(ProcessState processState, QProcessMetaData process, String lastStep, boolean includeLastStep) throws QException
+   private List<QStepMetaData> getAvailableStepList(ProcessState processState, QProcessMetaData process, String lastStep) throws QException
    {
       if(lastStep == null)
       {
@@ -716,10 +437,6 @@ public class RunProcessAction
             if(stepName.equals(lastStep))
             {
                foundLastStep = true;
-               if(includeLastStep)
-               {
-                  validStepNames.add(stepName);
-               }
             }
          }
          return (stepNamesToSteps(process, validStepNames));
@@ -731,7 +448,7 @@ public class RunProcessAction
    /*******************************************************************************
     **
     *******************************************************************************/
-   private static List<QStepMetaData> stepNamesToSteps(QProcessMetaData process, List<String> stepNames) throws QException
+   private List<QStepMetaData> stepNamesToSteps(QProcessMetaData process, List<String> stepNames) throws QException
    {
       List<QStepMetaData> result = new ArrayList<>();
 
@@ -800,13 +517,9 @@ public class RunProcessAction
    /*******************************************************************************
     **
     *******************************************************************************/
-   protected String determineBasepullKeyValue(QProcessMetaData process, RunProcessInput runProcessInput, BasepullConfiguration basepullConfiguration) throws QException
+   protected String determineBasepullKeyValue(QProcessMetaData process, BasepullConfiguration basepullConfiguration) throws QException
    {
       String basepullKeyValue = (basepullConfiguration.getKeyValue() != null) ? basepullConfiguration.getKeyValue() : process.getName();
-      if(runProcessInput.getValueString(BASEPULL_KEY_VALUE) != null)
-      {
-         basepullKeyValue = runProcessInput.getValueString(BASEPULL_KEY_VALUE);
-      }
 
       //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
       // if process specifies that it uses variants, look for that data in the session and append to our basepull key //
@@ -815,14 +528,13 @@ public class RunProcessAction
       {
          QSession         session         = QContext.getQSession();
          QBackendMetaData backendMetaData = QContext.getQInstance().getBackend(process.getVariantBackend());
-         String           variantTypeKey  = backendMetaData.getBackendVariantsConfig().getVariantTypeKey();
-         if(session.getBackendVariants() == null || !session.getBackendVariants().containsKey(variantTypeKey))
+         if(session.getBackendVariants() == null || !session.getBackendVariants().containsKey(backendMetaData.getVariantOptionsTableTypeValue()))
          {
             LOG.warn("Could not find Backend Variant information for Backend '" + backendMetaData.getName() + "'");
          }
          else
          {
-            basepullKeyValue += "-" + session.getBackendVariants().get(variantTypeKey);
+            basepullKeyValue += "-" + session.getBackendVariants().get(backendMetaData.getVariantOptionsTableTypeValue());
          }
       }
 
@@ -839,7 +551,7 @@ public class RunProcessAction
       String basepullTableName            = basepullConfiguration.getTableName();
       String basepullKeyFieldName         = basepullConfiguration.getKeyField();
       String basepullLastRunTimeFieldName = basepullConfiguration.getLastRunTimeFieldName();
-      String basepullKeyValue             = determineBasepullKeyValue(process, runProcessInput, basepullConfiguration);
+      String basepullKeyValue             = determineBasepullKeyValue(process, basepullConfiguration);
 
       ///////////////////////////////////////
       // get the stored basepull timestamp //
@@ -919,7 +631,7 @@ public class RunProcessAction
       String  basepullKeyFieldName                 = basepullConfiguration.getKeyField();
       String  basepullLastRunTimeFieldName         = basepullConfiguration.getLastRunTimeFieldName();
       Integer basepullHoursBackForInitialTimestamp = basepullConfiguration.getHoursBackForInitialTimestamp();
-      String  basepullKeyValue                     = determineBasepullKeyValue(process, runProcessInput, basepullConfiguration);
+      String  basepullKeyValue                     = determineBasepullKeyValue(process, basepullConfiguration);
 
       ///////////////////////////////////////
       // get the stored basepull timestamp //
@@ -951,153 +663,4 @@ public class RunProcessAction
       runProcessInput.getValues().put(BASEPULL_TIMESTAMP_FIELD, basepullConfiguration.getTimestampField());
       runProcessInput.getValues().put(BASEPULL_CONFIGURATION, basepullConfiguration);
    }
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   private void setupProcessTracer(RunProcessInput runProcessInput, QProcessMetaData process)
-   {
-      try
-      {
-         if(process.getProcessTracerCodeReference() != null)
-         {
-            processTracer = QCodeLoader.getAdHoc(ProcessTracerInterface.class, process.getProcessTracerCodeReference());
-         }
-
-         Serializable processTracerCodeReference = runProcessInput.getValue(PROCESS_TRACER_CODE_REFERENCE_FIELD);
-         if(processTracerCodeReference != null)
-         {
-            if(processTracerCodeReference instanceof QCodeReference codeReference)
-            {
-               processTracer = QCodeLoader.getAdHoc(ProcessTracerInterface.class, codeReference);
-            }
-         }
-      }
-      catch(Exception e)
-      {
-         LOG.warn("Error setting up processTracer", e, logPair("processName", runProcessInput.getProcessName()));
-      }
-   }
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   private void traceStartOrResume(RunProcessInput runProcessInput, QProcessMetaData process)
-   {
-      setupProcessTracer(runProcessInput, process);
-
-      try
-      {
-         if(processTracer != null)
-         {
-            if(StringUtils.hasContent(runProcessInput.getStartAfterStep()) || StringUtils.hasContent(runProcessInput.getStartAtStep()))
-            {
-               processTracer.handleProcessResume(runProcessInput);
-            }
-            else
-            {
-               processTracer.handleProcessStart(runProcessInput);
-            }
-         }
-      }
-      catch(Exception e)
-      {
-         LOG.info("Error in traceStart", e, logPair("processName", runProcessInput.getProcessName()));
-      }
-   }
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   private void traceBreakOrFinish(RunProcessInput runProcessInput, RunProcessOutput runProcessOutput, Exception processException)
-   {
-      try
-      {
-         if(processTracer != null)
-         {
-            ProcessState processState = runProcessOutput.getProcessState();
-            boolean      isBreak      = true;
-
-            /////////////////////////////////////////////////////////////
-            // if there's no next step, that means the process is done //
-            /////////////////////////////////////////////////////////////
-            if(processState.getNextStepName().isEmpty())
-            {
-               isBreak = false;
-            }
-            else
-            {
-               /////////////////////////////////////////////////////////////////
-               // or if the next step is the last index, then we're also done //
-               /////////////////////////////////////////////////////////////////
-               String nextStepName  = processState.getNextStepName().get();
-               int    nextStepIndex = processState.getStepList().indexOf(nextStepName);
-               if(nextStepIndex == processState.getStepList().size() - 1)
-               {
-                  isBreak = false;
-               }
-            }
-
-            if(isBreak)
-            {
-               processTracer.handleProcessBreak(runProcessInput, runProcessOutput, processException);
-            }
-            else
-            {
-               processTracer.handleProcessFinish(runProcessInput, runProcessOutput, processException);
-            }
-         }
-      }
-      catch(Exception e)
-      {
-         LOG.info("Error in traceProcessFinish", e, logPair("processName", runProcessInput.getProcessName()));
-      }
-   }
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   private void traceStepStart(RunBackendStepInput runBackendStepInput)
-   {
-      try
-      {
-         if(processTracer != null)
-         {
-            processTracer.handleStepStart(runBackendStepInput);
-         }
-      }
-      catch(Exception e)
-      {
-         LOG.info("Error in traceStepFinish", e, logPair("processName", runBackendStepInput.getProcessName()), logPair("stepName", runBackendStepInput.getStepName()));
-      }
-   }
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   private void traceStepFinish(RunBackendStepInput runBackendStepInput, RunBackendStepOutput runBackendStepOutput)
-   {
-      try
-      {
-         if(processTracer != null)
-         {
-            processTracer.handleStepFinish(runBackendStepInput, runBackendStepOutput);
-         }
-      }
-      catch(Exception e)
-      {
-         LOG.info("Error in traceStepFinish", e, logPair("processName", runBackendStepInput.getProcessName()), logPair("stepName", runBackendStepInput.getStepName()));
-      }
-   }
-
 }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/queues/SQSQueuePoller.java

@@ -24,7 +24,6 @@ package com.kingsrook.qqq.backend.core.actions.queues;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.function.Supplier;
 import com.amazonaws.auth.AWSStaticCredentialsProvider;
 import com.amazonaws.auth.BasicAWSCredentials;
@@ -42,8 +41,6 @@ import com.kingsrook.qqq.backend.core.model.actions.processes.RunProcessInput;
 import com.kingsrook.qqq.backend.core.model.actions.processes.RunProcessOutput;
 import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
 import com.kingsrook.qqq.backend.core.model.metadata.queues.QQueueMetaData;
-import com.kingsrook.qqq.backend.core.model.metadata.queues.SQSPollerSettings;
-import com.kingsrook.qqq.backend.core.model.metadata.queues.SQSQueueMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.queues.SQSQueueProviderMetaData;
 import com.kingsrook.qqq.backend.core.model.session.QSession;
 
@@ -93,17 +90,15 @@ public class SQSQueuePoller implements Runnable
          }
          queueUrl += queueMetaData.getQueueName();
 
-         SQSPollerSettings sqsPollerSettings = getSqsPollerSettings(queueProviderMetaData, queueMetaData);
-
-         for(int loop = 0; loop < sqsPollerSettings.getMaxLoops(); loop++)
+         while(true)
          {
             ///////////////////////////////
             // fetch a batch of messages //
             ///////////////////////////////
             ReceiveMessageRequest receiveMessageRequest = new ReceiveMessageRequest();
             receiveMessageRequest.setQueueUrl(queueUrl);
-            receiveMessageRequest.setMaxNumberOfMessages(sqsPollerSettings.getMaxNumberOfMessages());
-            receiveMessageRequest.setWaitTimeSeconds(sqsPollerSettings.getWaitTimeSeconds()); // larger value (e.g., 20) can help urge SQS to query multiple servers and find more messages
+            receiveMessageRequest.setMaxNumberOfMessages(10);
+            receiveMessageRequest.setWaitTimeSeconds(20); // help urge SQS to query multiple servers and find more messages
             ReceiveMessageResult receiveMessageResult = sqs.receiveMessage(receiveMessageRequest);
             if(receiveMessageResult.getMessages().isEmpty())
             {
@@ -182,47 +177,6 @@ public class SQSQueuePoller implements Runnable
 
 
 
-   /*******************************************************************************
-    ** For a given queueProvider and queue, get the poller settings to use (using
-    ** default values if none are set at either level).
-    *******************************************************************************/
-   static SQSPollerSettings getSqsPollerSettings(SQSQueueProviderMetaData queueProviderMetaData, QQueueMetaData queueMetaData)
-   {
-      /////////////////////////////////
-      // start with default settings //
-      /////////////////////////////////
-      SQSPollerSettings sqsPollerSettings = new SQSPollerSettings()
-         .withMaxLoops(Integer.MAX_VALUE)
-         .withMaxNumberOfMessages(10)
-         .withWaitTimeSeconds(20);
-
-      /////////////////////////////////////////////////////////////////////
-      // if the queue provider has settings, let them overwrite defaults //
-      /////////////////////////////////////////////////////////////////////
-      if(queueProviderMetaData != null && queueProviderMetaData.getPollerSettings() != null)
-      {
-         SQSPollerSettings providerSettings = queueProviderMetaData.getPollerSettings();
-         sqsPollerSettings.setMaxLoops(Objects.requireNonNullElse(providerSettings.getMaxLoops(), sqsPollerSettings.getMaxLoops()));
-         sqsPollerSettings.setMaxNumberOfMessages(Objects.requireNonNullElse(providerSettings.getMaxNumberOfMessages(), sqsPollerSettings.getMaxNumberOfMessages()));
-         sqsPollerSettings.setWaitTimeSeconds(Objects.requireNonNullElse(providerSettings.getWaitTimeSeconds(), sqsPollerSettings.getWaitTimeSeconds()));
-      }
-
-      ////////////////////////////////////////////////////////////
-      // if the queue has settings, let them overwrite defaults //
-      ////////////////////////////////////////////////////////////
-      if(queueMetaData instanceof SQSQueueMetaData sqsQueueMetaData && sqsQueueMetaData.getPollerSettings() != null)
-      {
-         SQSPollerSettings providerSettings = sqsQueueMetaData.getPollerSettings();
-         sqsPollerSettings.setMaxLoops(Objects.requireNonNullElse(providerSettings.getMaxLoops(), sqsPollerSettings.getMaxLoops()));
-         sqsPollerSettings.setMaxNumberOfMessages(Objects.requireNonNullElse(providerSettings.getMaxNumberOfMessages(), sqsPollerSettings.getMaxNumberOfMessages()));
-         sqsPollerSettings.setWaitTimeSeconds(Objects.requireNonNullElse(providerSettings.getWaitTimeSeconds(), sqsPollerSettings.getWaitTimeSeconds()));
-      }
-
-      return sqsPollerSettings;
-   }
-
-
-
    /*******************************************************************************
     ** Setter for queueProviderMetaData
     **

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/ExportsFullInstanceVerifier.java

@@ -1,202 +0,0 @@
-/*
- * QQQ - Low-code Application Framework for Engineers.
- * Copyright (C) 2021-2024.  Kingsrook, LLC
- * 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States
- * contact@kingsrook.com
- * https://github.com/Kingsrook/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.kingsrook.qqq.backend.core.actions.reporting;
-
-
-import java.io.ByteArrayOutputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-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.reporting.ExportInput;
-import com.kingsrook.qqq.backend.core.model.actions.reporting.ReportDestination;
-import com.kingsrook.qqq.backend.core.model.actions.reporting.ReportFormat;
-import com.kingsrook.qqq.backend.core.model.actions.tables.query.QCriteriaOperator;
-import com.kingsrook.qqq.backend.core.model.actions.tables.query.QQueryFilter;
-import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData;
-import com.kingsrook.qqq.backend.core.model.metadata.tables.Capability;
-import com.kingsrook.qqq.backend.core.model.metadata.tables.ExposedJoin;
-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.Pair;
-import com.kingsrook.qqq.backend.core.utils.StringUtils;
-import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
-
-
-/*******************************************************************************
- ** Utility for verifying that the ExportAction works for all tables, and all
- ** exposed joins.
- **
- ** Meant for use within a unit test, or maybe as part of an instance's boot-up/
- ** validation.
- *******************************************************************************/
-public class ExportsFullInstanceVerifier
-{
-   private static final QLogger LOG = QLogger.getLogger(ExportsFullInstanceVerifier.class);
-
-   private boolean filterForAtMostOneRowPerExport = true;
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   public void verify(Collection<QTableMetaData> tables) throws QException
-   {
-      Map<Pair<String, String>, Exception> caughtExceptions = new LinkedHashMap<>();
-      for(QTableMetaData table : tables)
-      {
-         if(table.isCapabilityEnabled(QContext.getQInstance().getBackendForTable(table.getName()), Capability.TABLE_QUERY))
-         {
-            LOG.info("Verifying Exports on table", logPair("tableName", table.getName()));
-
-            //////////////////////////////////////////////
-            // run the table by itself (no join fields) //
-            //////////////////////////////////////////////
-            runExport(table.getName(), Collections.emptyList(), "main-table-only", caughtExceptions);
-
-            ///////////////////////////////////////////////////
-            // run once w/ the fields from each exposed join //
-            ///////////////////////////////////////////////////
-            for(ExposedJoin exposedJoin : CollectionUtils.nonNullList(table.getExposedJoins()))
-            {
-               runExport(table.getName(), List.of(exposedJoin), "join-" + exposedJoin.getLabel(), caughtExceptions);
-            }
-
-            /////////////////////////////////////////////////
-            // run w/ all exposed joins (if there are any) //
-            /////////////////////////////////////////////////
-            if(CollectionUtils.nullSafeHasContents(table.getExposedJoins()))
-            {
-               runExport(table.getName(), table.getExposedJoins(), "all-joins", caughtExceptions);
-            }
-         }
-      }
-
-      //////////////////////////////////
-      // log out an exceptions caught //
-      //////////////////////////////////
-      if(!caughtExceptions.isEmpty())
-      {
-         for(Map.Entry<Pair<String, String>, Exception> entry : caughtExceptions.entrySet())
-         {
-            LOG.info("Caught an exception verifying reports", entry.getValue(), logPair("tableName", entry.getKey().getA()), logPair("fieldName", entry.getKey().getB()));
-         }
-         throw (new QException("Reports Verification failed with " + caughtExceptions.size() + " exception" + StringUtils.plural(caughtExceptions.size())));
-      }
-   }
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   private void runExport(String tableName, List<ExposedJoin> exposedJoinList, String description, Map<Pair<String, String>, Exception> caughtExceptions)
-   {
-      try
-      {
-         ////////////////////////////////////////////////////////////////////////////////////
-         // build the list of fieldNames to export - starting with all fields in the table //
-         ////////////////////////////////////////////////////////////////////////////////////
-         List<String> fieldNames = new ArrayList<>();
-         for(QFieldMetaData field : QContext.getQInstance().getTable(tableName).getFields().values())
-         {
-            fieldNames.add(field.getName());
-         }
-
-         ///////////////////////////////////////////////////
-         // add all fields from all exposed joins as well //
-         ///////////////////////////////////////////////////
-         for(ExposedJoin exposedJoin : CollectionUtils.nonNullList(exposedJoinList))
-         {
-            QTableMetaData joinTable = QContext.getQInstance().getTable(exposedJoin.getJoinTable());
-            for(QFieldMetaData field : joinTable.getFields().values())
-            {
-               fieldNames.add(joinTable.getName() + "." + field.getName());
-            }
-         }
-
-         LOG.info("Verifying export", logPair("description", description), logPair("fieldCount", fieldNames.size()));
-
-         QQueryFilter queryFilter = new QQueryFilter();
-
-         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-         // if caller is okay with a filter that should limit the report to a small number of rows (could be more than 1 for to-many joins), then do so //
-         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-         if(filterForAtMostOneRowPerExport)
-         {
-            queryFilter.withCriteria(QContext.getQInstance().getTable(tableName).getPrimaryKeyField(), QCriteriaOperator.EQUALS, 1);
-         }
-
-         ExportInput exportInput = new ExportInput();
-         exportInput.setTableName(tableName);
-         exportInput.setFieldNames(fieldNames);
-         exportInput.setReportDestination(new ReportDestination()
-            .withReportOutputStream(new ByteArrayOutputStream())
-            .withReportFormat(ReportFormat.CSV));
-         exportInput.setQueryFilter(queryFilter);
-         new ExportAction().execute(exportInput);
-      }
-      catch(QException e)
-      {
-         caughtExceptions.put(Pair.of(tableName, description), e);
-      }
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for filterForAtMostOneRowPerExport
-    *******************************************************************************/
-   public boolean getFilterForAtMostOneRowPerExport()
-   {
-      return (this.filterForAtMostOneRowPerExport);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for filterForAtMostOneRowPerExport
-    *******************************************************************************/
-   public void setFilterForAtMostOneRowPerExport(boolean filterForAtMostOneRowPerExport)
-   {
-      this.filterForAtMostOneRowPerExport = filterForAtMostOneRowPerExport;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for filterForAtMostOneRowPerExport
-    *******************************************************************************/
-   public ExportsFullInstanceVerifier withFilterForAtMostOneRowPerExport(boolean filterForAtMostOneRowPerExport)
-   {
-      this.filterForAtMostOneRowPerExport = filterForAtMostOneRowPerExport;
-      return (this);
-   }
-
-
-}

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/GenerateReportAction.java

@@ -42,7 +42,6 @@ import com.kingsrook.qqq.backend.core.actions.AbstractQActionFunction;
 import com.kingsrook.qqq.backend.core.actions.async.AsyncRecordPipeLoop;
 import com.kingsrook.qqq.backend.core.actions.customizers.QCodeLoader;
 import com.kingsrook.qqq.backend.core.actions.reporting.customizers.DataSourceQueryInputCustomizer;
-import com.kingsrook.qqq.backend.core.actions.reporting.customizers.ReportCustomRecordSourceInterface;
 import com.kingsrook.qqq.backend.core.actions.reporting.customizers.ReportViewCustomizer;
 import com.kingsrook.qqq.backend.core.actions.tables.CountAction;
 import com.kingsrook.qqq.backend.core.actions.tables.QueryAction;
@@ -63,15 +62,11 @@ import com.kingsrook.qqq.backend.core.model.actions.reporting.ReportOutput;
 import com.kingsrook.qqq.backend.core.model.actions.tables.QueryHint;
 import com.kingsrook.qqq.backend.core.model.actions.tables.count.CountInput;
 import com.kingsrook.qqq.backend.core.model.actions.tables.count.CountOutput;
-import com.kingsrook.qqq.backend.core.model.actions.tables.query.CriteriaMissingInputValueBehavior;
-import com.kingsrook.qqq.backend.core.model.actions.tables.query.FilterUseCase;
 import com.kingsrook.qqq.backend.core.model.actions.tables.query.JoinsContext;
 import com.kingsrook.qqq.backend.core.model.actions.tables.query.QFilterOrderBy;
 import com.kingsrook.qqq.backend.core.model.actions.tables.query.QQueryFilter;
 import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryInput;
-import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryJoin;
 import com.kingsrook.qqq.backend.core.model.data.QRecord;
-import com.kingsrook.qqq.backend.core.model.metadata.fields.FieldAndJoinTable;
 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.reporting.QReportDataSource;
@@ -306,19 +301,10 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
       JoinsContext joinsContext = null;
       if(dataSource != null)
       {
-         ///////////////////////////////////////////////////////////////////////////////////////
-         // count records, if applicable, from the data source - for populating into the      //
-         // countByDataSource map, as well as for checking if too many rows (e.g., for excel) //
-         ///////////////////////////////////////////////////////////////////////////////////////
-         countDataSourceRecords(reportInput, dataSource, reportFormat);
-
-         ///////////////////////////////////////////////////////////////////////////////////////////
-         // if there's a source table, set up a joins context, to use below for looking up fields //
-         ///////////////////////////////////////////////////////////////////////////////////////////
          if(StringUtils.hasContent(dataSource.getSourceTable()))
          {
-            QQueryFilter queryFilter = dataSource.getQueryFilter() == null ? new QQueryFilter() : dataSource.getQueryFilter().clone();
-            joinsContext = new JoinsContext(QContext.getQInstance(), dataSource.getSourceTable(), dataSource.getQueryJoins(), queryFilter);
+            joinsContext = new JoinsContext(exportInput.getInstance(), dataSource.getSourceTable(), dataSource.getQueryJoins(), dataSource.getQueryFilter());
+            countDataSourceRecords(reportInput, dataSource, reportFormat);
          }
       }
 
@@ -342,7 +328,6 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
             field.setName(column.getName());
             if(StringUtils.hasContent(column.getLabel()))
             {
-
                field.setLabel(column.getLabel());
             }
             fields.add(field);
@@ -360,33 +345,23 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
     *******************************************************************************/
    private void countDataSourceRecords(ReportInput reportInput, QReportDataSource dataSource, ReportFormat reportFormat) throws QException
    {
-      Integer count = null;
-      if(dataSource.getCustomRecordSource() != null)
+      QQueryFilter queryFilter = dataSource.getQueryFilter() == null ? new QQueryFilter() : dataSource.getQueryFilter().clone();
+      setInputValuesInQueryFilter(reportInput, queryFilter);
+
+      CountInput countInput = new CountInput();
+      countInput.setTableName(dataSource.getSourceTable());
+      countInput.setFilter(queryFilter);
+      countInput.setQueryJoins(dataSource.getQueryJoins());
+      CountOutput countOutput = new CountAction().execute(countInput);
+
+      if(countOutput.getCount() != null)
       {
-         // todo - add `count` method to interface?
-      }
-      else if(StringUtils.hasContent(dataSource.getSourceTable()))
-      {
-         QQueryFilter queryFilter = dataSource.getQueryFilter() == null ? new QQueryFilter() : dataSource.getQueryFilter().clone();
-         setInputValuesInQueryFilter(reportInput, queryFilter);
+         countByDataSource.put(dataSource.getName(), countOutput.getCount());
 
-         CountInput countInput = new CountInput();
-         countInput.setTableName(dataSource.getSourceTable());
-         countInput.setFilter(queryFilter);
-         countInput.setQueryJoins(cloneDataSourceQueryJoins(dataSource));
-         CountOutput countOutput = new CountAction().execute(countInput);
-
-         count = countOutput.getCount();
-      }
-
-      if(count != null)
-      {
-         countByDataSource.put(dataSource.getName(), count);
-
-         if(reportFormat.getMaxRows() != null && count > reportFormat.getMaxRows())
+         if(reportFormat.getMaxRows() != null && countOutput.getCount() > reportFormat.getMaxRows())
          {
             throw (new QUserFacingException("The requested report would include more rows ("
-               + String.format("%,d", count) + ") than the maximum allowed ("
+               + String.format("%,d", countOutput.getCount()) + ") than the maximum allowed ("
                + String.format("%,d", reportFormat.getMaxRows()) + ") for the selected file format (" + reportFormat + ")."));
          }
       }
@@ -394,26 +369,6 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
 
 
 
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   private static List<QueryJoin> cloneDataSourceQueryJoins(QReportDataSource dataSource)
-   {
-      if(dataSource == null || dataSource.getQueryJoins() == null)
-      {
-         return (null);
-      }
-
-      List<QueryJoin> rs = new ArrayList<>();
-      for(QueryJoin queryJoin : dataSource.getQueryJoins())
-      {
-         rs.add(queryJoin.clone());
-      }
-      return (rs);
-   }
-
-
-
    /*******************************************************************************
     **
     *******************************************************************************/
@@ -447,19 +402,13 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
       String        tableLabel    = ObjectUtils.tryElse(() -> QContext.getQInstance().getTable(dataSource.getSourceTable()).getLabel(), Objects.requireNonNullElse(dataSource.getSourceTable(), ""));
       AtomicInteger consumedCount = new AtomicInteger(0);
 
-      /////////////////////////////////////////////////////////////////////////////////////////////////
-      // run a record pipe loop, over the query (or other data-supplier/source) for this data source //
-      /////////////////////////////////////////////////////////////////////////////////////////////////
+      /////////////////////////////////////////////////////////////////
+      // run a record pipe loop, over the query for this data source //
+      /////////////////////////////////////////////////////////////////
       RecordPipe recordPipe = new BufferedRecordPipe(1000);
       new AsyncRecordPipeLoop().run("Report[" + reportInput.getReportName() + "]", null, recordPipe, (callback) ->
       {
-         if(dataSource.getCustomRecordSource() != null)
-         {
-            ReportCustomRecordSourceInterface recordSource = QCodeLoader.getAdHoc(ReportCustomRecordSourceInterface.class, dataSource.getCustomRecordSource());
-            recordSource.execute(reportInput, dataSource, recordPipe);
-            return (true);
-         }
-         else if(dataSource.getSourceTable() != null)
+         if(dataSource.getSourceTable() != null)
          {
             QQueryFilter queryFilter = dataSource.getQueryFilter() == null ? new QQueryFilter() : dataSource.getQueryFilter().clone();
             setInputValuesInQueryFilter(reportInput, queryFilter);
@@ -468,12 +417,12 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
             queryInput.setRecordPipe(recordPipe);
             queryInput.setTableName(dataSource.getSourceTable());
             queryInput.setFilter(queryFilter);
-            queryInput.setQueryJoins(cloneDataSourceQueryJoins(dataSource));
+            queryInput.setQueryJoins(dataSource.getQueryJoins());
             queryInput.withQueryHint(QueryHint.POTENTIALLY_LARGE_NUMBER_OF_RESULTS);
             queryInput.withQueryHint(QueryHint.MAY_USE_READ_ONLY_BACKEND);
 
             queryInput.setShouldTranslatePossibleValues(true);
-            queryInput.setFieldsToTranslatePossibleValues(setupFieldsToTranslatePossibleValues(reportInput, dataSource));
+            queryInput.setFieldsToTranslatePossibleValues(setupFieldsToTranslatePossibleValues(reportInput, dataSource, new JoinsContext(reportInput.getInstance(), dataSource.getSourceTable(), dataSource.getQueryJoins(), queryInput.getFilter())));
 
             if(dataSource.getQueryInputCustomizer() != null)
             {
@@ -525,7 +474,7 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
          }
          consumedCount.getAndAdd(records.size());
 
-         return (consumeRecords(dataSource, records, tableView, summaryViews, variantViews));
+         return (consumeRecords(reportInput, dataSource, records, tableView, summaryViews, variantViews));
       });
 
       ////////////////////////////////////////////////
@@ -544,7 +493,7 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
    /*******************************************************************************
     **
     *******************************************************************************/
-   private Set<String> setupFieldsToTranslatePossibleValues(ReportInput reportInput, QReportDataSource dataSource) throws QException
+   private Set<String> setupFieldsToTranslatePossibleValues(ReportInput reportInput, QReportDataSource dataSource, JoinsContext joinsContext) throws QException
    {
       Set<String> fieldsToTranslatePossibleValues = new HashSet<>();
 
@@ -568,7 +517,7 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
             // all pivotFields that are possible value sources are implicitly translated //
             ///////////////////////////////////////////////////////////////////////////////
             QTableMetaData    mainTable         = QContext.getQInstance().getTable(dataSource.getSourceTable());
-            FieldAndJoinTable fieldAndJoinTable = FieldAndJoinTable.get(mainTable, summaryFieldName);
+            FieldAndJoinTable fieldAndJoinTable = getFieldAndJoinTable(mainTable, summaryFieldName);
             if(fieldAndJoinTable.field().getPossibleValueSourceName() != null)
             {
                fieldsToTranslatePossibleValues.add(summaryFieldName);
@@ -584,62 +533,24 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
    /*******************************************************************************
     **
     *******************************************************************************/
-   private void setInputValuesInQueryFilter(ReportInput reportInput, QQueryFilter queryFilter) throws QException
+   public static FieldAndJoinTable getFieldAndJoinTable(QTableMetaData mainTable, String fieldName) throws QException
    {
-      if(queryFilter == null || queryFilter.getCriteria() == null)
+      if(fieldName.indexOf('.') > -1)
       {
-         return;
-      }
+         String joinTableName = fieldName.replaceAll("\\..*", "");
+         String joinFieldName = fieldName.replaceAll(".*\\.", "");
 
-      //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-      // for reports defined in meta-data, the established rule is, that missing input variable values are discarded. //
-      // but for non-meta-data reports (e.g., user-saved), we expect an exception for missing values.                 //
-      // so, set those use-cases up.                                                                                  //
-      //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-      FilterUseCase filterUseCase;
-      if(StringUtils.hasContent(reportInput.getReportName()) && QContext.getQInstance().getReport(reportInput.getReportName()) != null)
-      {
-         filterUseCase = new ReportFromMetaDataFilterUseCase();
+         QTableMetaData joinTable = QContext.getQInstance().getTable(joinTableName);
+         if(joinTable == null)
+         {
+            throw (new QException("Unrecognized join table name: " + joinTableName));
+         }
+
+         return new FieldAndJoinTable(joinTable.getField(joinFieldName), joinTable);
       }
       else
       {
-         filterUseCase = new ReportNotFromMetaDataFilterUseCase();
-      }
-
-      queryFilter.interpretValues(reportInput.getInputValues(), filterUseCase);
-   }
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   private static class ReportFromMetaDataFilterUseCase implements FilterUseCase
-   {
-      /***************************************************************************
-       **
-       ***************************************************************************/
-      @Override
-      public CriteriaMissingInputValueBehavior getDefaultCriteriaMissingInputValueBehavior()
-      {
-         return CriteriaMissingInputValueBehavior.REMOVE_FROM_FILTER;
-      }
-   }
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   private static class ReportNotFromMetaDataFilterUseCase implements FilterUseCase
-   {
-      /***************************************************************************
-       **
-       ***************************************************************************/
-      @Override
-      public CriteriaMissingInputValueBehavior getDefaultCriteriaMissingInputValueBehavior()
-      {
-         return CriteriaMissingInputValueBehavior.THROW_EXCEPTION;
+         return new FieldAndJoinTable(mainTable.getField(fieldName), mainTable);
       }
    }
 
@@ -648,9 +559,24 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
    /*******************************************************************************
     **
     *******************************************************************************/
-   private Integer consumeRecords(QReportDataSource dataSource, List<QRecord> records, QReportView tableView, List<QReportView> summaryViews, List<QReportView> variantViews) throws QException
+   private void setInputValuesInQueryFilter(ReportInput reportInput, QQueryFilter queryFilter) throws QException
    {
-      QTableMetaData table = QContext.getQInstance().getTable(dataSource.getSourceTable());
+      if(queryFilter == null || queryFilter.getCriteria() == null)
+      {
+         return;
+      }
+
+      queryFilter.interpretValues(reportInput.getInputValues());
+   }
+
+
+
+   /*******************************************************************************
+    **
+    *******************************************************************************/
+   private Integer consumeRecords(ReportInput reportInput, QReportDataSource dataSource, List<QRecord> records, QReportView tableView, List<QReportView> summaryViews, List<QReportView> variantViews) throws QException
+   {
+      QTableMetaData table = reportInput.getInstance().getTable(dataSource.getSourceTable());
 
       ////////////////////////////////////////////////////////////////////////////
       // if this record goes on a table view, add it to the report streamer now //
@@ -731,7 +657,7 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
          SummaryKey key = new SummaryKey();
          for(String summaryFieldName : view.getSummaryFields())
          {
-            FieldAndJoinTable fieldAndJoinTable = FieldAndJoinTable.get(table, summaryFieldName);
+            FieldAndJoinTable fieldAndJoinTable = getFieldAndJoinTable(table, summaryFieldName);
             Serializable      summaryValue      = record.getValue(summaryFieldName);
             if(fieldAndJoinTable.field().getPossibleValueSourceName() != null)
             {
@@ -761,7 +687,7 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
    /*******************************************************************************
     **
     *******************************************************************************/
-   private void addRecordToSummaryKeyAggregates(QTableMetaData table, QRecord record, Map<SummaryKey, Map<String, AggregatesInterface<?, ?>>> viewAggregates, SummaryKey key)
+   private void addRecordToSummaryKeyAggregates(QTableMetaData table, QRecord record, Map<SummaryKey, Map<String, AggregatesInterface<?, ?>>> viewAggregates, SummaryKey key) throws QException
    {
       Map<String, AggregatesInterface<?, ?>> keyAggregates = viewAggregates.computeIfAbsent(key, (name) -> new HashMap<>());
       addRecordToAggregatesMap(table, record, keyAggregates);
@@ -772,7 +698,7 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
    /*******************************************************************************
     **
     *******************************************************************************/
-   private void addRecordToAggregatesMap(QTableMetaData table, QRecord record, Map<String, AggregatesInterface<?, ?>> aggregatesMap)
+   private void addRecordToAggregatesMap(QTableMetaData table, QRecord record, Map<String, AggregatesInterface<?, ?>> aggregatesMap) throws QException
    {
       //////////////////////////////////////////////////////////////////////////////////////
       // todo - an optimization could be, to only compute aggregates that we'll need...   //
@@ -780,13 +706,13 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
       //////////////////////////////////////////////////////////////////////////////////////
       for(String fieldName : record.getValues().keySet())
       {
-         QFieldMetaData field;
+         QFieldMetaData field = null;
          try
          {
             //////////////////////////////////////////////////////
             // todo - memoize this, if we ever need to optimize //
             //////////////////////////////////////////////////////
-            FieldAndJoinTable fieldAndJoinTable = FieldAndJoinTable.get(table, fieldName);
+            FieldAndJoinTable fieldAndJoinTable = getFieldAndJoinTable(table, fieldName);
             field = fieldAndJoinTable.field();
          }
          catch(Exception e)
@@ -853,14 +779,9 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
       List<QReportView> reportViews = views.stream().filter(v -> v.getType().equals(ReportType.SUMMARY)).toList();
       for(QReportView view : reportViews)
       {
-         QReportDataSource dataSource = getDataSource(view.getDataSourceName());
-         if(dataSource == null)
-         {
-            throw new QReportingException("Data source for summary view was not found (viewName=" + view.getName() + ", dataSourceName=" + view.getDataSourceName() + ").");
-         }
-
-         QTableMetaData table         = QContext.getQInstance().getTable(dataSource.getSourceTable());
-         SummaryOutput  summaryOutput = computeSummaryRowsForView(reportInput, view, table);
+         QReportDataSource dataSource    = getDataSource(view.getDataSourceName());
+         QTableMetaData    table         = reportInput.getInstance().getTable(dataSource.getSourceTable());
+         SummaryOutput     summaryOutput = computeSummaryRowsForView(reportInput, view, table);
 
          ExportInput exportInput = new ExportInput();
          exportInput.setReportDestination(reportInput.getReportDestination());
@@ -931,7 +852,7 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
       List<QFieldMetaData> fields = new ArrayList<>();
       for(String summaryFieldName : view.getSummaryFields())
       {
-         FieldAndJoinTable fieldAndJoinTable = FieldAndJoinTable.get(table, summaryFieldName);
+         FieldAndJoinTable fieldAndJoinTable = getFieldAndJoinTable(table, summaryFieldName);
          fields.add(new QFieldMetaData(summaryFieldName, fieldAndJoinTable.field().getType()).withLabel(fieldAndJoinTable.field().getLabel())); // todo do we need the type?  if so need table as input here
       }
       for(QReportField column : view.getColumns())
@@ -946,8 +867,9 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
    /*******************************************************************************
     **
     *******************************************************************************/
-   private SummaryOutput computeSummaryRowsForView(ReportInput reportInput, QReportView view, QTableMetaData table) throws QFormulaException
+   private SummaryOutput computeSummaryRowsForView(ReportInput reportInput, QReportView view, QTableMetaData table) throws QReportingException, QFormulaException
    {
+      QValueFormatter              valueFormatter      = new QValueFormatter();
       QMetaDataVariableInterpreter variableInterpreter = new QMetaDataVariableInterpreter();
       variableInterpreter.addValueMap("input", reportInput.getInputValues());
       variableInterpreter.addValueMap("total", getSummaryValuesForInterpreter(totalAggregates));
@@ -1019,7 +941,10 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
       //////////////////////////////////////////////////////////////////////////////////////
       if(CollectionUtils.nullSafeHasContents(view.getOrderByFields()))
       {
-         summaryRows.sort((o1, o2) -> summaryRowComparator(view, o1, o2));
+         summaryRows.sort((o1, o2) ->
+         {
+            return summaryRowComparator(view, o1, o2);
+         });
       }
 
       ////////////////
@@ -1054,6 +979,8 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
             Serializable serializable = getValueForColumn(variableInterpreter, column);
             totalRow.setValue(column.getName(), serializable);
             thisRowValues.put(column.getName(), serializable);
+
+            String formatted = valueFormatter.formatValue(column.getDisplayFormat(), serializable);
          }
       }
 
@@ -1076,7 +1003,7 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
             titleValues.add(variableInterpreter.interpret(titleField));
          }
 
-         title = QValueFormatter.formatStringWithValues(view.getTitleFormat(), titleValues);
+         title = new QValueFormatter().formatStringWithValues(view.getTitleFormat(), titleValues);
       }
       else if(StringUtils.hasContent(view.getTitleFormat()))
       {
@@ -1183,4 +1110,27 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
    {
    }
 
+
+
+   /*******************************************************************************
+    **
+    *******************************************************************************/
+   public record FieldAndJoinTable(QFieldMetaData field, QTableMetaData joinTable)
+   {
+
+      /*******************************************************************************
+       **
+       *******************************************************************************/
+      public String getLabel(QTableMetaData mainTable)
+      {
+         if(mainTable.getName().equals(joinTable.getName()))
+         {
+            return (field.getLabel());
+         }
+         else
+         {
+            return (joinTable.getLabel() + ": " + field.getLabel());
+         }
+      }
+   }
 }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/customizers/ReportCustomRecordSourceInterface.java

@@ -1,43 +0,0 @@
-/*
- * QQQ - Low-code Application Framework for Engineers.
- * Copyright (C) 2021-2024.  Kingsrook, LLC
- * 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States
- * contact@kingsrook.com
- * https://github.com/Kingsrook/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.kingsrook.qqq.backend.core.actions.reporting.customizers;
-
-
-import com.kingsrook.qqq.backend.core.actions.reporting.RecordPipe;
-import com.kingsrook.qqq.backend.core.exceptions.QException;
-import com.kingsrook.qqq.backend.core.model.actions.reporting.ReportInput;
-import com.kingsrook.qqq.backend.core.model.metadata.reporting.QReportDataSource;
-
-
-/*******************************************************************************
- ** Interface to be implemented to do a custom source of data for a report
- ** (instead of just a query against a table).
- *******************************************************************************/
-public interface ReportCustomRecordSourceInterface
-{
-
-   /***************************************************************************
-    ** Given the report input, put records into the pipe, for the report.
-    ***************************************************************************/
-   void execute(ReportInput reportInput, QReportDataSource reportDataSource, RecordPipe recordPipe) throws QException;
-
-}

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 = QContext.getQInstance();
+            QInstance instance = exportInput.getInstance();
             if(instance != null && instance.getBranding() != null && instance.getBranding().getCompanyName() != null)
             {
                appName = instance.getBranding().getCompanyName();

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/excel/poi/ExcelPoiBasedStreamingExportStreamer.java

@@ -124,11 +124,10 @@ public class ExcelPoiBasedStreamingExportStreamer implements ExportStreamerInter
    private Writer              activeSheetWriter = null;
    private StreamedSheetWriter sheetWriter       = null;
 
-   private QReportView                       currentView              = null;
-   private Map<String, List<QFieldMetaData>> fieldsPerView            = new HashMap<>();
-   private Map<String, Integer>              rowsPerView              = new HashMap<>();
-   private Map<String, String>               labelViewsByName         = new HashMap<>();
-   private Map<String, String>               sheetReferenceByViewName = new HashMap<>();
+   private QReportView                       currentView      = null;
+   private Map<String, List<QFieldMetaData>> fieldsPerView    = new HashMap<>();
+   private Map<String, Integer>              rowsPerView      = new HashMap<>();
+   private Map<String, String>               labelViewsByName = new HashMap<>();
 
 
 
@@ -181,7 +180,6 @@ public class ExcelPoiBasedStreamingExportStreamer implements ExportStreamerInter
             String    sheetReference = sheet.getPackagePart().getPartName().getName().substring(1);
             sheetMapByExcelReference.put(sheetReference, sheet);
             sheetMapByViewName.put(view.getName(), sheet);
-            sheetReferenceByViewName.put(view.getName(), sheetReference);
             sheetCounter++;
          }
 
@@ -448,7 +446,7 @@ public class ExcelPoiBasedStreamingExportStreamer implements ExportStreamerInter
          // - with a new output stream writer    //
          // - and with a SpreadsheetWriter       //
          //////////////////////////////////////////
-         zipOutputStream.putNextEntry(new ZipEntry(sheetReferenceByViewName.get(view.getName())));
+         zipOutputStream.putNextEntry(new ZipEntry("xl/worksheets/sheet" + this.sheetIndex++ + ".xml"));
          activeSheetWriter = new OutputStreamWriter(zipOutputStream);
          sheetWriter = new StreamedSheetWriter(activeSheetWriter);
 

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/reporting/excel/poi/StreamedSheetWriter.java

@@ -161,7 +161,7 @@ public class StreamedSheetWriter
             }
          }
 
-         Map<String, Integer> m = new HashMap<>();
+         Map<String, Integer> m = new HashMap();
          m.computeIfAbsent("s", (s) -> 3);
 
          value = rs.toString();

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/scripts/RecordScriptTestInterface.java

@@ -23,7 +23,6 @@ package com.kingsrook.qqq.backend.core.actions.scripts;
 
 
 import java.io.Serializable;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import com.kingsrook.qqq.backend.core.actions.scripts.logging.BuildScriptLogAndScriptLogLineExecutionLogger;
@@ -98,7 +97,7 @@ public class RecordScriptTestInterface implements TestScriptActionInterface
          }
 
          QueryOutput queryOutput = new QueryAction().execute(new QueryInput(tableName)
-            .withFilter(new QQueryFilter(new QFilterCriteria(table.getPrimaryKeyField(), QCriteriaOperator.IN, Arrays.stream(recordPrimaryKeyList.split(",")).toList())))
+            .withFilter(new QQueryFilter(new QFilterCriteria(table.getPrimaryKeyField(), QCriteriaOperator.IN, recordPrimaryKeyList.split(","))))
             .withIncludeAssociations(true));
          if(CollectionUtils.nullSafeIsEmpty(queryOutput.getRecords()))
          {

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/scripts/RunAdHocRecordScriptAction.java

@@ -154,9 +154,8 @@ public class RunAdHocRecordScriptAction
          Method   qRecordListToApiRecordList = apiScriptUtilsClass.getMethod("qRecordListToApiRecordList", List.class, String.class, String.class, String.class);
          Object   apiRecordList              = qRecordListToApiRecordList.invoke(null, input.getRecordList(), input.getTableName(), scriptRevision.getApiName(), scriptRevision.getApiVersion());
 
-         @SuppressWarnings("unchecked")
-         ArrayList<? extends Serializable> rs = (ArrayList<? extends Serializable>) apiRecordList;
-         return rs;
+         // noinspection unchecked
+         return (ArrayList<? extends Serializable>) apiRecordList;
       }
       catch(ClassNotFoundException e)
       {

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/scripts/logging/BuildScriptLogAndScriptLogLineExecutionLogger.java

@@ -94,7 +94,7 @@ public class BuildScriptLogAndScriptLogLineExecutionLogger implements QCodeExecu
    protected QRecord buildDetailLogRecord(String logLine)
    {
       return (new QRecord()
-         .withValue("scriptLogId", scriptLog == null ? null : scriptLog.getValue("id"))
+         .withValue("scriptLogId", scriptLog.getValue("id"))
          .withValue("timestamp", Instant.now())
          .withValue("text", truncate(logLine)));
    }
@@ -145,14 +145,6 @@ public class BuildScriptLogAndScriptLogLineExecutionLogger implements QCodeExecu
       {
          this.executeCodeInput = executeCodeInput;
          this.scriptLog = buildHeaderRecord(executeCodeInput);
-
-         if(scriptLogLines != null)
-         {
-            for(QRecord scriptLogLine : scriptLogLines)
-            {
-               scriptLogLine.setValue("scriptLogId", scriptLog.getValue("id"));
-            }
-         }
       }
       catch(Exception e)
       {

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/AggregateAction.java

@@ -22,12 +22,9 @@
 package com.kingsrook.qqq.backend.core.actions.tables;
 
 
-import java.util.Collections;
 import com.kingsrook.qqq.backend.core.actions.ActionHelper;
 import com.kingsrook.qqq.backend.core.actions.interfaces.AggregateInterface;
 import com.kingsrook.qqq.backend.core.actions.tables.helpers.QueryStatManager;
-import com.kingsrook.qqq.backend.core.actions.values.ValueBehaviorApplier;
-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.aggregate.AggregateInput;
@@ -61,11 +58,6 @@ public class AggregateAction
       QTableMetaData   table   = aggregateInput.getTable();
       QBackendMetaData backend = aggregateInput.getBackend();
 
-      ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-      // apply any available field behaviors to the filter (noting that, if anything changes, a new filter is returned) //
-      ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-      aggregateInput.setFilter(ValueBehaviorApplier.applyFieldBehaviorsToFilter(QContext.getQInstance(), table, aggregateInput.getFilter(), Collections.emptySet()));
-
       QueryStat queryStat = QueryStatManager.newQueryStat(backend, table, aggregateInput.getFilter());
 
       QBackendModuleDispatcher qBackendModuleDispatcher = new QBackendModuleDispatcher();
@@ -75,10 +67,6 @@ public class AggregateAction
       aggregateInterface.setQueryStat(queryStat);
       AggregateOutput aggregateOutput = aggregateInterface.execute(aggregateInput);
 
-      // todo, maybe, not real important? ValueBehaviorApplier.applyFieldBehaviors(ValueBehaviorApplier.Action.READ, QContext.getQInstance(), table, aggregateOutput.getResults(), null);
-      //  issue being, the signature there... it takes a list of QRecords, which aren't what we have...
-      //  do we want to ... idk, refactor all these behavior deals?  hmm... maybe a new interface/ for ones that do reads?  not sure.
-
       QueryStatManager.getInstance().add(queryStat);
 
       return aggregateOutput;

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/CountAction.java

@@ -22,12 +22,9 @@
 package com.kingsrook.qqq.backend.core.actions.tables;
 
 
-import java.util.Collections;
 import com.kingsrook.qqq.backend.core.actions.ActionHelper;
 import com.kingsrook.qqq.backend.core.actions.interfaces.CountInterface;
 import com.kingsrook.qqq.backend.core.actions.tables.helpers.QueryStatManager;
-import com.kingsrook.qqq.backend.core.actions.values.ValueBehaviorApplier;
-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.count.CountInput;
@@ -61,11 +58,6 @@ public class CountAction
       QTableMetaData   table   = countInput.getTable();
       QBackendMetaData backend = countInput.getBackend();
 
-      ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-      // apply any available field behaviors to the filter (noting that, if anything changes, a new filter is returned) //
-      ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-      countInput.setFilter(ValueBehaviorApplier.applyFieldBehaviorsToFilter(QContext.getQInstance(), table, countInput.getFilter(), Collections.emptySet()));
-
       QueryStat queryStat = QueryStatManager.newQueryStat(backend, table, countInput.getFilter());
 
       QBackendModuleDispatcher qBackendModuleDispatcher = new QBackendModuleDispatcher();

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/DeleteAction.java

@@ -82,11 +82,6 @@ public class DeleteAction
    {
       ActionHelper.validateSession(deleteInput);
 
-      if(deleteInput.getTableName() == null)
-      {
-         throw (new QException("Table name was not specified in delete input"));
-      }
-
       QTableMetaData table               = deleteInput.getTable();
       String         primaryKeyFieldName = table.getPrimaryKeyField();
       QFieldMetaData primaryKeyField     = table.getField(primaryKeyFieldName);
@@ -325,7 +320,7 @@ public class DeleteAction
       QTableMetaData table               = deleteInput.getTable();
       List<QRecord>  primaryKeysNotFound = validateRecordsExistAndCanBeAccessed(deleteInput, oldRecordList.get());
 
-      ValidateRecordSecurityLockHelper.validateSecurityFields(table, oldRecordList.get(), ValidateRecordSecurityLockHelper.Action.DELETE, deleteInput.getTransaction());
+      ValidateRecordSecurityLockHelper.validateSecurityFields(table, oldRecordList.get(), ValidateRecordSecurityLockHelper.Action.DELETE);
 
       ///////////////////////////////////////////////////////////////////////////
       // after all validations, run the pre-delete customizer, if there is one //

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/GetAction.java

@@ -23,8 +23,6 @@ package com.kingsrook.qqq.backend.core.actions.tables;
 
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -36,10 +34,8 @@ import com.kingsrook.qqq.backend.core.actions.interfaces.GetInterface;
 import com.kingsrook.qqq.backend.core.actions.tables.helpers.GetActionCacheHelper;
 import com.kingsrook.qqq.backend.core.actions.values.QPossibleValueTranslator;
 import com.kingsrook.qqq.backend.core.actions.values.QValueFormatter;
-import com.kingsrook.qqq.backend.core.actions.values.ValueBehaviorApplier;
 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.get.GetInput;
 import com.kingsrook.qqq.backend.core.model.actions.tables.get.GetOutput;
 import com.kingsrook.qqq.backend.core.model.actions.tables.query.QCriteriaOperator;
@@ -49,16 +45,11 @@ 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.fields.AdornmentType;
-import com.kingsrook.qqq.backend.core.model.metadata.fields.FieldBehavior;
-import com.kingsrook.qqq.backend.core.model.metadata.fields.FieldFilterBehavior;
 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.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.ObjectUtils;
-import com.kingsrook.qqq.backend.core.utils.Pair;
-import com.kingsrook.qqq.backend.core.utils.memoization.Memoization;
 
 
 /*******************************************************************************
@@ -67,15 +58,11 @@ import com.kingsrook.qqq.backend.core.utils.memoization.Memoization;
  *******************************************************************************/
 public class GetAction
 {
-   private static final QLogger LOG = QLogger.getLogger(GetAction.class);
-
    private Optional<TableCustomizerInterface> postGetRecordCustomizer;
 
    private GetInput                 getInput;
    private QPossibleValueTranslator qPossibleValueTranslator;
 
-   private Memoization<Pair<String, String>, List<FieldFilterBehavior<?>>> getFieldFilterBehaviorMemoization = new Memoization<>();
-
 
 
    /*******************************************************************************
@@ -118,8 +105,6 @@ public class GetAction
          usingDefaultGetInterface = true;
       }
 
-      getInput = applyFieldBehaviors(getInput);
-
       getInterface.validateInput(getInput);
       getOutput = getInterface.execute(getInput);
 
@@ -145,82 +130,6 @@ public class GetAction
 
 
 
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   private GetInput applyFieldBehaviors(GetInput getInput)
-   {
-      QTableMetaData table = getInput.getTable();
-
-      try
-      {
-         if(getInput.getPrimaryKey() != null)
-         {
-            ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            // if the input has a primary key, get its behaviors, then apply, and update the pkey in the input if the value is different //
-            ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            List<FieldFilterBehavior<?>> fieldFilterBehaviors = getFieldFilterBehaviors(table, table.getPrimaryKeyField());
-            for(FieldFilterBehavior<?> fieldFilterBehavior : CollectionUtils.nonNullList(fieldFilterBehaviors))
-            {
-               QFilterCriteria pkeyCriteria    = new QFilterCriteria(table.getPrimaryKeyField(), QCriteriaOperator.EQUALS, getInput.getPrimaryKey());
-               QFilterCriteria updatedCriteria = ValueBehaviorApplier.apply(pkeyCriteria, QContext.getQInstance(), table, table.getField(table.getPrimaryKeyField()), fieldFilterBehavior);
-               if(updatedCriteria != pkeyCriteria)
-               {
-                  getInput.setPrimaryKey(updatedCriteria.getValues().get(0));
-               }
-            }
-         }
-         else if(getInput.getUniqueKey() != null)
-         {
-            ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            // if the input has a unique key, get its behaviors, then apply, and update the ukey values in the input if any are different //
-            ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            Map<String, Serializable> updatedUniqueKey = new HashMap<>(getInput.getUniqueKey());
-            for(String fieldName : getInput.getUniqueKey().keySet())
-            {
-               List<FieldFilterBehavior<?>> fieldFilterBehaviors = getFieldFilterBehaviors(table, fieldName);
-               for(FieldFilterBehavior<?> fieldFilterBehavior : CollectionUtils.nonNullList(fieldFilterBehaviors))
-               {
-                  QFilterCriteria ukeyCriteria    = new QFilterCriteria(fieldName, QCriteriaOperator.EQUALS, updatedUniqueKey.get(fieldName));
-                  QFilterCriteria updatedCriteria = ValueBehaviorApplier.apply(ukeyCriteria, QContext.getQInstance(), table, table.getField(table.getPrimaryKeyField()), fieldFilterBehavior);
-                  updatedUniqueKey.put(fieldName, updatedCriteria.getValues().get(0));
-               }
-            }
-            getInput.setUniqueKey(updatedUniqueKey);
-         }
-      }
-      catch(Exception e)
-      {
-         LOG.warn("Error applying field behaviors to get input - will run with original inputs", e);
-      }
-
-      return (getInput);
-   }
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   private List<FieldFilterBehavior<?>> getFieldFilterBehaviors(QTableMetaData tableMetaData, String fieldName)
-   {
-      Pair<String, String> key = new Pair<>(tableMetaData.getName(), fieldName);
-      return getFieldFilterBehaviorMemoization.getResult(key, (p) ->
-      {
-         List<FieldFilterBehavior<?>> rs = new ArrayList<>();
-         for(FieldBehavior<?> fieldBehavior : CollectionUtils.nonNullCollection(tableMetaData.getFields().get(fieldName).getBehaviors()))
-         {
-            if(fieldBehavior instanceof FieldFilterBehavior<?> fieldFilterBehavior)
-            {
-               rs.add(fieldFilterBehavior);
-            }
-         }
-         return (rs);
-      }).orElse(null);
-   }
-
-
-
    /*******************************************************************************
     ** shorthand way to call for the most common use-case, when you just want the
     ** output record to be returned.
@@ -346,13 +255,11 @@ public class GetAction
          returnRecord = postGetRecordCustomizer.get().postQuery(getInput, List.of(record)).get(0);
       }
 
-      ValueBehaviorApplier.applyFieldBehaviors(ValueBehaviorApplier.Action.READ, QContext.getQInstance(), getInput.getTable(), List.of(record), null);
-
       if(getInput.getShouldTranslatePossibleValues())
       {
          if(qPossibleValueTranslator == null)
          {
-            qPossibleValueTranslator = new QPossibleValueTranslator(QContext.getQInstance(), QContext.getQSession());
+            qPossibleValueTranslator = new QPossibleValueTranslator(getInput.getInstance(), getInput.getSession());
          }
          qPossibleValueTranslator.translatePossibleValuesInRecords(getInput.getTable(), List.of(returnRecord));
       }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/InsertAction.java

@@ -67,7 +67,6 @@ import com.kingsrook.qqq.backend.core.model.statusmessages.QWarningMessage;
 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.StringUtils;
 import com.kingsrook.qqq.backend.core.utils.ValueUtils;
 import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
 
@@ -111,12 +110,6 @@ public class InsertAction extends AbstractQActionFunction<InsertInput, InsertOut
    public InsertOutput execute(InsertInput insertInput) throws QException
    {
       ActionHelper.validateSession(insertInput);
-
-      if(!StringUtils.hasContent(insertInput.getTableName()))
-      {
-         throw (new QException("Table name was not specified in update input"));
-      }
-
       QTableMetaData table = insertInput.getTable();
 
       if(table == null)
@@ -129,7 +122,7 @@ public class InsertAction extends AbstractQActionFunction<InsertInput, InsertOut
       /////////////////////////////
       // run standard validators //
       /////////////////////////////
-      performValidations(insertInput, false, false);
+      performValidations(insertInput, false);
 
       //////////////////////////////////////////////////////
       // use the backend module to actually do the insert //
@@ -232,26 +225,23 @@ public class InsertAction extends AbstractQActionFunction<InsertInput, InsertOut
    /*******************************************************************************
     **
     *******************************************************************************/
-   public void performValidations(InsertInput insertInput, boolean isPreview, boolean didAlreadyRunCustomizer) throws QException
+   public void performValidations(InsertInput insertInput, boolean isPreview) throws QException
    {
-      if(CollectionUtils.nullSafeIsEmpty(insertInput.getRecords()))
-      {
-         return;
-      }
-
       QTableMetaData table = insertInput.getTable();
 
       ///////////////////////////////////////////////////////////////////
       // load the pre-insert customizer and set it up, if there is one //
       // then we'll run it based on its WhenToRun value                //
-      // note - if we already ran it, then don't re-run it!            //
       ///////////////////////////////////////////////////////////////////
-      Optional<TableCustomizerInterface> preInsertCustomizer = didAlreadyRunCustomizer ? Optional.empty() : QCodeLoader.getTableCustomizer(table, TableCustomizers.PRE_INSERT_RECORD.getRole());
-      runPreInsertCustomizerIfItIsTime(insertInput, isPreview, preInsertCustomizer, AbstractPreInsertCustomizer.WhenToRun.BEFORE_ALL_VALIDATIONS);
+      Optional<TableCustomizerInterface> preInsertCustomizer = QCodeLoader.getTableCustomizer(table, TableCustomizers.PRE_INSERT_RECORD.getRole());
+      if(preInsertCustomizer.isPresent())
+      {
+         runPreInsertCustomizerIfItIsTime(insertInput, isPreview, preInsertCustomizer, AbstractPreInsertCustomizer.WhenToRun.BEFORE_ALL_VALIDATIONS);
+      }
 
       setDefaultValuesInRecords(table, insertInput.getRecords());
 
-      ValueBehaviorApplier.applyFieldBehaviors(ValueBehaviorApplier.Action.INSERT, QContext.getQInstance(), table, insertInput.getRecords(), null);
+      ValueBehaviorApplier.applyFieldBehaviors(ValueBehaviorApplier.Action.INSERT, insertInput.getInstance(), table, insertInput.getRecords(), null);
 
       runPreInsertCustomizerIfItIsTime(insertInput, isPreview, preInsertCustomizer, AbstractPreInsertCustomizer.WhenToRun.BEFORE_UNIQUE_KEY_CHECKS);
       setErrorsIfUniqueKeyErrors(insertInput, table);
@@ -263,7 +253,7 @@ public class InsertAction extends AbstractQActionFunction<InsertInput, InsertOut
       }
 
       runPreInsertCustomizerIfItIsTime(insertInput, isPreview, preInsertCustomizer, AbstractPreInsertCustomizer.WhenToRun.BEFORE_SECURITY_CHECKS);
-      ValidateRecordSecurityLockHelper.validateSecurityFields(insertInput.getTable(), insertInput.getRecords(), ValidateRecordSecurityLockHelper.Action.INSERT, insertInput.getTransaction());
+      ValidateRecordSecurityLockHelper.validateSecurityFields(insertInput.getTable(), insertInput.getRecords(), ValidateRecordSecurityLockHelper.Action.INSERT);
 
       runPreInsertCustomizerIfItIsTime(insertInput, isPreview, preInsertCustomizer, AbstractPreInsertCustomizer.WhenToRun.AFTER_ALL_VALIDATIONS);
    }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/QueryAction.java

@@ -25,8 +25,6 @@ package com.kingsrook.qqq.backend.core.actions.tables;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -43,7 +41,6 @@ import com.kingsrook.qqq.backend.core.actions.tables.helpers.QueryActionCacheHel
 import com.kingsrook.qqq.backend.core.actions.tables.helpers.QueryStatManager;
 import com.kingsrook.qqq.backend.core.actions.values.QPossibleValueTranslator;
 import com.kingsrook.qqq.backend.core.actions.values.QValueFormatter;
-import com.kingsrook.qqq.backend.core.actions.values.ValueBehaviorApplier;
 import com.kingsrook.qqq.backend.core.context.QContext;
 import com.kingsrook.qqq.backend.core.exceptions.QException;
 import com.kingsrook.qqq.backend.core.logging.QLogger;
@@ -51,10 +48,8 @@ import com.kingsrook.qqq.backend.core.model.actions.tables.query.QCriteriaOperat
 import com.kingsrook.qqq.backend.core.model.actions.tables.query.QFilterCriteria;
 import com.kingsrook.qqq.backend.core.model.actions.tables.query.QQueryFilter;
 import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryInput;
-import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryJoin;
 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.data.QRecordEntity;
 import com.kingsrook.qqq.backend.core.model.metadata.QBackendMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.fields.AdornmentType;
 import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData;
@@ -67,7 +62,6 @@ 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.ListingHash;
-import com.kingsrook.qqq.backend.core.utils.StringUtils;
 import com.kingsrook.qqq.backend.core.utils.ValueUtils;
 
 
@@ -105,8 +99,6 @@ public class QueryAction
          throw (new QException("A table named [" + queryInput.getTableName() + "] was not found in the active QInstance"));
       }
 
-      validateFieldNamesToInclude(queryInput);
-
       QBackendMetaData backend = queryInput.getBackend();
       postQueryRecordCustomizer = QCodeLoader.getTableCustomizer(table, TableCustomizers.POST_QUERY_RECORD.getRole());
       this.queryInput = queryInput;
@@ -125,11 +117,6 @@ public class QueryAction
          }
       }
 
-      ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-      // apply any available field behaviors to the filter (noting that, if anything changes, a new filter is returned) //
-      ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-      queryInput.setFilter(ValueBehaviorApplier.applyFieldBehaviorsToFilter(QContext.getQInstance(), table, queryInput.getFilter(), Collections.emptySet()));
-
       QueryStat queryStat = QueryStatManager.newQueryStat(backend, table, queryInput.getFilter());
 
       QBackendModuleDispatcher qBackendModuleDispatcher = new QBackendModuleDispatcher();
@@ -164,125 +151,6 @@ public class QueryAction
 
 
 
-   /***************************************************************************
-    ** if QueryInput contains a set of FieldNamesToInclude, then validate that
-    ** those are known field names in the table being queried, or a selected
-    ** queryJoin.
-    ***************************************************************************/
-   static void validateFieldNamesToInclude(QueryInput queryInput) throws QException
-   {
-      Set<String> fieldNamesToInclude = queryInput.getFieldNamesToInclude();
-      if(fieldNamesToInclude == null)
-      {
-         ////////////////////////////////
-         // null set means select all. //
-         ////////////////////////////////
-         return;
-      }
-
-      if(fieldNamesToInclude.isEmpty())
-      {
-         /////////////////////////////////////
-         // empty set, however, is an error //
-         /////////////////////////////////////
-         throw (new QException("An empty set of fieldNamesToInclude was given as queryInput, which is not allowed."));
-      }
-
-      List<String>                unrecognizedFieldNames = new ArrayList<>();
-      Map<String, QTableMetaData> selectedQueryJoins     = null;
-      for(String fieldName : fieldNamesToInclude)
-      {
-         if(fieldName.contains("."))
-         {
-            ////////////////////////////////////////////////
-            // handle names with dots - fields from joins //
-            ////////////////////////////////////////////////
-            String[] parts = fieldName.split("\\.");
-            if(parts.length != 2)
-            {
-               unrecognizedFieldNames.add(fieldName);
-            }
-            else
-            {
-               String tableOrAlias  = parts[0];
-               String fieldNamePart = parts[1];
-
-               ////////////////////////////////////////////
-               // build map of queryJoins being selected //
-               ////////////////////////////////////////////
-               if(selectedQueryJoins == null)
-               {
-                  selectedQueryJoins = new HashMap<>();
-                  for(QueryJoin queryJoin : CollectionUtils.nonNullList(queryInput.getQueryJoins()))
-                  {
-                     if(queryJoin.getSelect())
-                     {
-                        String         joinTableOrAlias = queryJoin.getJoinTableOrItsAlias();
-                        QTableMetaData joinTable        = QContext.getQInstance().getTable(queryJoin.getJoinTable());
-                        if(joinTable != null)
-                        {
-                           selectedQueryJoins.put(joinTableOrAlias, joinTable);
-                        }
-                     }
-                  }
-               }
-
-               if(!selectedQueryJoins.containsKey(tableOrAlias))
-               {
-                  ///////////////////////////////////////////
-                  // unrecognized tableOrAlias is an error //
-                  ///////////////////////////////////////////
-                  unrecognizedFieldNames.add(fieldName);
-               }
-               else
-               {
-                  QTableMetaData joinTable = selectedQueryJoins.get(tableOrAlias);
-                  if(!joinTable.getFields().containsKey(fieldNamePart))
-                  {
-                     //////////////////////////////////////////////////////////
-                     // unrecognized field within the join table is an error //
-                     //////////////////////////////////////////////////////////
-                     unrecognizedFieldNames.add(fieldName);
-                  }
-               }
-            }
-         }
-         else
-         {
-            ///////////////////////////////////////////////////////////////////////
-            // non-join fields - just ensure field name is in table's fields map //
-            ///////////////////////////////////////////////////////////////////////
-            if(!queryInput.getTable().getFields().containsKey(fieldName))
-            {
-               unrecognizedFieldNames.add(fieldName);
-            }
-         }
-      }
-
-      if(!unrecognizedFieldNames.isEmpty())
-      {
-         throw (new QException("QueryInput contained " + unrecognizedFieldNames.size() + " unrecognized field name" + StringUtils.plural(unrecognizedFieldNames) + ": " + StringUtils.join(",", unrecognizedFieldNames)));
-      }
-   }
-
-
-
-   /*******************************************************************************
-    ** shorthand way to call for the most common use-case, when you just want the
-    ** entities to be returned, and you just want to pass in a table name and filter.
-    *******************************************************************************/
-   public static <T extends QRecordEntity> List<T> execute(String tableName, Class<T> entityClass, QQueryFilter filter) throws QException
-   {
-      QueryAction queryAction = new QueryAction();
-      QueryInput  queryInput  = new QueryInput();
-      queryInput.setTableName(tableName);
-      queryInput.setFilter(filter);
-      QueryOutput queryOutput = queryAction.execute(queryInput);
-      return (queryOutput.getRecordEntities(entityClass));
-   }
-
-
-
    /*******************************************************************************
     ** shorthand way to call for the most common use-case, when you just want the
     ** records to be returned, and you just want to pass in a table name and filter.
@@ -416,13 +284,11 @@ public class QueryAction
          records = postQueryRecordCustomizer.get().postQuery(queryInput, records);
       }
 
-      ValueBehaviorApplier.applyFieldBehaviors(ValueBehaviorApplier.Action.READ, QContext.getQInstance(), queryInput.getTable(), records, null);
-
       if(queryInput.getShouldTranslatePossibleValues())
       {
          if(qPossibleValueTranslator == null)
          {
-            qPossibleValueTranslator = new QPossibleValueTranslator(QContext.getQInstance(), QContext.getQSession());
+            qPossibleValueTranslator = new QPossibleValueTranslator(queryInput.getInstance(), queryInput.getSession());
          }
          qPossibleValueTranslator.translatePossibleValuesInRecords(queryInput.getTable(), records, queryInput.getQueryJoins(), queryInput.getFieldsToTranslatePossibleValues());
       }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/StorageAction.java

@@ -47,8 +47,7 @@ public class StorageAction
 {
 
    /*******************************************************************************
-    ** create an output stream in the storage backend - that can be written to,
-    ** for the purpose of inserting or writing a file into storage.
+    **
     *******************************************************************************/
    public OutputStream createOutputStream(StorageInput storageInput) throws QException
    {
@@ -60,8 +59,7 @@ public class StorageAction
 
 
    /*******************************************************************************
-    ** create an input stream in the storage backend - that can be read from,
-    ** for the purpose of getting or reading a file from storage.
+    **
     *******************************************************************************/
    public InputStream getInputStream(StorageInput storageInput) throws QException
    {

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/UpdateAction.java

@@ -74,7 +74,6 @@ import com.kingsrook.qqq.backend.core.model.statusmessages.QWarningMessage;
 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.StringUtils;
 import com.kingsrook.qqq.backend.core.utils.ValueUtils;
 import org.apache.commons.lang.BooleanUtils;
 import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
@@ -119,11 +118,6 @@ public class UpdateAction
    {
       ActionHelper.validateSession(updateInput);
 
-      if(!StringUtils.hasContent(updateInput.getTableName()))
-      {
-         throw (new QException("Table name was not specified in update input"));
-      }
-
       QTableMetaData table = updateInput.getTable();
 
       //////////////////////////////////////////////////////
@@ -258,7 +252,7 @@ public class UpdateAction
          behaviorsToOmit = Set.of(DynamicDefaultValueBehavior.MODIFY_DATE);
       }
 
-      ValueBehaviorApplier.applyFieldBehaviors(ValueBehaviorApplier.Action.UPDATE, QContext.getQInstance(), table, updateInput.getRecords(), behaviorsToOmit);
+      ValueBehaviorApplier.applyFieldBehaviors(ValueBehaviorApplier.Action.UPDATE, updateInput.getInstance(), table, updateInput.getRecords(), behaviorsToOmit);
       validatePrimaryKeysAreGiven(updateInput);
 
       if(oldRecordList.isPresent())
@@ -267,7 +261,7 @@ public class UpdateAction
       }
       else
       {
-         ValidateRecordSecurityLockHelper.validateSecurityFields(table, updateInput.getRecords(), ValidateRecordSecurityLockHelper.Action.UPDATE, updateInput.getTransaction());
+         ValidateRecordSecurityLockHelper.validateSecurityFields(table, updateInput.getRecords(), ValidateRecordSecurityLockHelper.Action.UPDATE);
       }
 
       if(updateInput.getInputSource().shouldValidateRequiredFields())
@@ -380,7 +374,7 @@ public class UpdateAction
             }
          }
 
-         ValidateRecordSecurityLockHelper.validateSecurityFields(table, updateInput.getRecords(), ValidateRecordSecurityLockHelper.Action.UPDATE, updateInput.getTransaction());
+         ValidateRecordSecurityLockHelper.validateSecurityFields(table, updateInput.getRecords(), ValidateRecordSecurityLockHelper.Action.UPDATE);
 
          for(QRecord record : page)
          {

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/helpers/QueryStatManager.java

@@ -31,12 +31,16 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Supplier;
+import com.kingsrook.qqq.backend.core.actions.tables.GetAction;
 import com.kingsrook.qqq.backend.core.actions.tables.InsertAction;
 import com.kingsrook.qqq.backend.core.context.QContext;
 import com.kingsrook.qqq.backend.core.exceptions.QException;
 import com.kingsrook.qqq.backend.core.instances.QMetaDataVariableInterpreter;
 import com.kingsrook.qqq.backend.core.logging.QLogger;
+import com.kingsrook.qqq.backend.core.model.actions.tables.get.GetInput;
+import com.kingsrook.qqq.backend.core.model.actions.tables.get.GetOutput;
 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.query.QFilterCriteria;
 import com.kingsrook.qqq.backend.core.model.actions.tables.query.QFilterOrderBy;
 import com.kingsrook.qqq.backend.core.model.actions.tables.query.QQueryFilter;
@@ -50,10 +54,12 @@ import com.kingsrook.qqq.backend.core.model.querystats.QueryStatCriteriaField;
 import com.kingsrook.qqq.backend.core.model.querystats.QueryStatJoinTable;
 import com.kingsrook.qqq.backend.core.model.querystats.QueryStatOrderByField;
 import com.kingsrook.qqq.backend.core.model.session.QSession;
-import com.kingsrook.qqq.backend.core.model.tables.QQQTableTableManager;
+import com.kingsrook.qqq.backend.core.model.tables.QQQTable;
+import com.kingsrook.qqq.backend.core.model.tables.QQQTablesMetaDataProvider;
 import com.kingsrook.qqq.backend.core.utils.CollectionUtils;
 import com.kingsrook.qqq.backend.core.utils.PrefixedDefaultThreadFactory;
 import com.kingsrook.qqq.backend.core.utils.StringUtils;
+import com.kingsrook.qqq.backend.core.utils.collections.MapBuilder;
 import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
 
 
@@ -365,7 +371,7 @@ public class QueryStatManager
                   //////////////////////
                   // set the table id //
                   //////////////////////
-                  Integer qqqTableId = QQQTableTableManager.getQQQTableId(getInstance().qInstance, queryStat.getTableName());
+                  Integer qqqTableId = getQQQTableId(queryStat.getTableName());
                   queryStat.setQqqTableId(qqqTableId);
 
                   //////////////////////////////
@@ -376,7 +382,7 @@ public class QueryStatManager
                      List<QueryStatJoinTable> queryStatJoinTableList = new ArrayList<>();
                      for(String joinTableName : queryStat.getJoinTableNames())
                      {
-                        queryStatJoinTableList.add(new QueryStatJoinTable().withQqqTableId(QQQTableTableManager.getQQQTableId(getInstance().qInstance, joinTableName)));
+                        queryStatJoinTableList.add(new QueryStatJoinTable().withQqqTableId(getQQQTableId(joinTableName)));
                      }
                      queryStat.setQueryStatJoinTableList(queryStatJoinTableList);
                   }
@@ -454,7 +460,7 @@ public class QueryStatManager
                String[] parts = fieldName.split("\\.");
                if(parts.length > 1)
                {
-                  queryStatCriteriaField.setQqqTableId(QQQTableTableManager.getQQQTableId(getInstance().qInstance, parts[0]));
+                  queryStatCriteriaField.setQqqTableId(getQQQTableId(parts[0]));
                   queryStatCriteriaField.setName(parts[1]);
                }
             }
@@ -492,7 +498,7 @@ public class QueryStatManager
                   String[] parts = fieldName.split("\\.");
                   if(parts.length > 1)
                   {
-                     queryStatOrderByField.setQqqTableId(QQQTableTableManager.getQQQTableId(getInstance().qInstance, parts[0]));
+                     queryStatOrderByField.setQqqTableId(getQQQTableId(parts[0]));
                      queryStatOrderByField.setName(parts[1]);
                   }
                }
@@ -506,6 +512,44 @@ public class QueryStatManager
             }
          }
       }
+
+
+
+      /*******************************************************************************
+       **
+       *******************************************************************************/
+      private static Integer getQQQTableId(String tableName) throws QException
+      {
+         /////////////////////////////
+         // look in the cache table //
+         /////////////////////////////
+         GetInput getInput = new GetInput();
+         getInput.setTableName(QQQTablesMetaDataProvider.QQQ_TABLE_CACHE_TABLE_NAME);
+         getInput.setUniqueKey(MapBuilder.of("name", tableName));
+         GetOutput getOutput = new GetAction().execute(getInput);
+
+         ////////////////////////
+         // upon cache miss... //
+         ////////////////////////
+         if(getOutput.getRecord() == null)
+         {
+            ///////////////////////////////////////////////////////
+            // insert the record (into the table, not the cache) //
+            ///////////////////////////////////////////////////////
+            QTableMetaData tableMetaData = getInstance().qInstance.getTable(tableName);
+            InsertInput    insertInput   = new InsertInput();
+            insertInput.setTableName(QQQTable.TABLE_NAME);
+            insertInput.setRecords(List.of(new QRecord().withValue("name", tableName).withValue("label", tableMetaData.getLabel())));
+            InsertOutput insertOutput = new InsertAction().execute(insertInput);
+
+            ///////////////////////////////////
+            // repeat the get from the cache //
+            ///////////////////////////////////
+            getOutput = new GetAction().execute(getInput);
+         }
+
+         return getOutput.getRecord().getValueInteger("id");
+      }
    }
 
 

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/helpers/UniqueKeyHelper.java

@@ -50,7 +50,6 @@ import com.kingsrook.qqq.backend.core.utils.ValueUtils;
  *******************************************************************************/
 public class UniqueKeyHelper
 {
-   private static Integer pageSize = 1000;
 
    /*******************************************************************************
     **
@@ -61,71 +60,62 @@ public class UniqueKeyHelper
       Map<List<Serializable>, Serializable> existingRecords = new HashMap<>();
       if(ukFieldNames != null)
       {
-         for(List<QRecord> page : CollectionUtils.getPages(recordList, pageSize))
+         QueryInput queryInput = new QueryInput();
+         queryInput.setTableName(table.getName());
+         queryInput.setTransaction(transaction);
+
+         QQueryFilter filter = new QQueryFilter();
+         if(ukFieldNames.size() == 1)
          {
-            QueryInput queryInput = new QueryInput();
-            queryInput.setTableName(table.getName());
-            queryInput.setTransaction(transaction);
-
-            QQueryFilter filter = new QQueryFilter();
-            if(ukFieldNames.size() == 1)
+            List<Serializable> values = recordList.stream()
+               .filter(r -> CollectionUtils.nullSafeIsEmpty(r.getErrors()))
+               .map(r -> r.getValue(ukFieldNames.get(0)))
+               .collect(Collectors.toList());
+            filter.addCriteria(new QFilterCriteria(ukFieldNames.get(0), QCriteriaOperator.IN, values));
+         }
+         else
+         {
+            filter.setBooleanOperator(QQueryFilter.BooleanOperator.OR);
+            for(QRecord record : recordList)
             {
-               List<Serializable> values = page.stream()
-                  .filter(r -> CollectionUtils.nullSafeIsEmpty(r.getErrors()))
-                  .map(r -> r.getValue(ukFieldNames.get(0)))
-                  .collect(Collectors.toList());
-
-               if(values.isEmpty())
+               if(CollectionUtils.nullSafeHasContents(record.getErrors()))
                {
                   continue;
                }
 
-               filter.addCriteria(new QFilterCriteria(ukFieldNames.get(0), QCriteriaOperator.IN, values));
-            }
-            else
-            {
-               filter.setBooleanOperator(QQueryFilter.BooleanOperator.OR);
-               for(QRecord record : page)
+               QQueryFilter subFilter = new QQueryFilter();
+               filter.addSubFilter(subFilter);
+               for(String fieldName : ukFieldNames)
                {
-                  if(CollectionUtils.nullSafeHasContents(record.getErrors()))
+                  Serializable value = record.getValue(fieldName);
+                  if(value == null)
                   {
-                     continue;
+                     subFilter.addCriteria(new QFilterCriteria(fieldName, QCriteriaOperator.IS_BLANK));
                   }
-
-                  QQueryFilter subFilter = new QQueryFilter();
-                  filter.addSubFilter(subFilter);
-                  for(String fieldName : ukFieldNames)
+                  else
                   {
-                     Serializable value = record.getValue(fieldName);
-                     if(value == null)
-                     {
-                        subFilter.addCriteria(new QFilterCriteria(fieldName, QCriteriaOperator.IS_BLANK));
-                     }
-                     else
-                     {
-                        subFilter.addCriteria(new QFilterCriteria(fieldName, QCriteriaOperator.EQUALS, value));
-                     }
+                     subFilter.addCriteria(new QFilterCriteria(fieldName, QCriteriaOperator.EQUALS, value));
                   }
                }
-
-               if(CollectionUtils.nullSafeIsEmpty(filter.getSubFilters()))
-               {
-                  ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-                  // if we didn't build any sub-filters (because all records have errors in them), don't run a query w/ no clauses - continue to next page //
-                  ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-                  continue;
-               }
             }
 
-            queryInput.setFilter(filter);
-            QueryOutput queryOutput = new QueryAction().execute(queryInput);
-            for(QRecord record : queryOutput.getRecords())
+            if(CollectionUtils.nullSafeIsEmpty(filter.getSubFilters()))
             {
-               Optional<List<Serializable>> keyValues = getKeyValues(table, uniqueKey, record, allowNullKeyValuesToEqual);
-               if(keyValues.isPresent())
-               {
-                  existingRecords.put(keyValues.get(), record.getValue(table.getPrimaryKeyField()));
-               }
+               ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+               // if we didn't build any sub-filters (because all records have errors in them), don't run a query w/ no clauses - rather - return early. //
+               ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+               return (existingRecords);
+            }
+         }
+
+         queryInput.setFilter(filter);
+         QueryOutput queryOutput = new QueryAction().execute(queryInput);
+         for(QRecord record : queryOutput.getRecords())
+         {
+            Optional<List<Serializable>> keyValues = getKeyValues(table, uniqueKey, record, allowNullKeyValuesToEqual);
+            if(keyValues.isPresent())
+            {
+               existingRecords.put(keyValues.get(), record.getValue(table.getPrimaryKeyField()));
             }
          }
       }
@@ -210,26 +200,4 @@ public class UniqueKeyHelper
       }
    }
 
-
-
-   /*******************************************************************************
-    ** Getter for pageSize
-    **
-    *******************************************************************************/
-   public static Integer getPageSize()
-   {
-      return pageSize;
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for pageSize
-    **
-    *******************************************************************************/
-   public static void setPageSize(Integer pageSize)
-   {
-      UniqueKeyHelper.pageSize = pageSize;
-   }
-
 }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/tables/helpers/ValidateRecordSecurityLockHelper.java

@@ -28,7 +28,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import com.kingsrook.qqq.backend.core.actions.QBackendTransaction;
 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;
@@ -84,7 +83,7 @@ public class ValidateRecordSecurityLockHelper
    /*******************************************************************************
     **
     *******************************************************************************/
-   public static void validateSecurityFields(QTableMetaData table, List<QRecord> records, Action action, QBackendTransaction transaction) throws QException
+   public static void validateSecurityFields(QTableMetaData table, List<QRecord> records, Action action) throws QException
    {
       MultiRecordSecurityLock locksToCheck = getRecordSecurityLocks(table, action);
       if(locksToCheck == null || CollectionUtils.nullSafeIsEmpty(locksToCheck.getLocks()))
@@ -102,7 +101,7 @@ public class ValidateRecordSecurityLockHelper
       // actually check lock values //
       ////////////////////////////////
       Map<Serializable, RecordWithErrors> errorRecords = new HashMap<>();
-      evaluateRecordLocks(table, records, action, locksToCheck, errorRecords, new ArrayList<>(), madeUpPrimaryKeys, transaction);
+      evaluateRecordLocks(table, records, action, locksToCheck, errorRecords, new ArrayList<>(), madeUpPrimaryKeys);
 
       /////////////////////////////////
       // propagate errors to records //
@@ -142,7 +141,7 @@ public class ValidateRecordSecurityLockHelper
     ** BUT - WRITE locks - in their case, we read the record no matter what, and in
     ** here we need to verify we have a key that allows us to WRITE the record.
     *******************************************************************************/
-   private static void evaluateRecordLocks(QTableMetaData table, List<QRecord> records, Action action, RecordSecurityLock recordSecurityLock, Map<Serializable, RecordWithErrors> errorRecords, List<Integer> treePosition, Map<Serializable, QRecord> madeUpPrimaryKeys, QBackendTransaction transaction) throws QException
+   private static void evaluateRecordLocks(QTableMetaData table, List<QRecord> records, Action action, RecordSecurityLock recordSecurityLock, Map<Serializable, RecordWithErrors> errorRecords, List<Integer> treePosition, Map<Serializable, QRecord> madeUpPrimaryKeys) throws QException
    {
       if(recordSecurityLock instanceof MultiRecordSecurityLock multiRecordSecurityLock)
       {
@@ -153,7 +152,7 @@ public class ValidateRecordSecurityLockHelper
          for(RecordSecurityLock childLock : CollectionUtils.nonNullList(multiRecordSecurityLock.getLocks()))
          {
             treePosition.add(i);
-            evaluateRecordLocks(table, records, action, childLock, errorRecords, treePosition, madeUpPrimaryKeys, transaction);
+            evaluateRecordLocks(table, records, action, childLock, errorRecords, treePosition, madeUpPrimaryKeys);
             treePosition.remove(treePosition.size() - 1);
             i++;
          }
@@ -226,7 +225,6 @@ public class ValidateRecordSecurityLockHelper
             // query will be like (fkey1=? and fkey2=?) OR (fkey1=? and fkey2=?) OR (fkey1=? and fkey2=?) //
             ////////////////////////////////////////////////////////////////////////////////////////////////
             QueryInput queryInput = new QueryInput();
-            queryInput.setTransaction(transaction);
             queryInput.setTableName(leftMostJoin.getLeftTable());
             QQueryFilter filter = new QQueryFilter().withBooleanOperator(QQueryFilter.BooleanOperator.OR);
             queryInput.setFilter(filter);

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/templates/RenderTemplateAction.java

@@ -104,21 +104,10 @@ public class RenderTemplateAction extends AbstractQActionFunction<RenderTemplate
 
 
 
-   /*******************************************************************************
-    ** Static wrapper to render a Velocity template.
-    *******************************************************************************/
-   @Deprecated(since = "Call the version that doesn't take an ActionInput")
-   public static String renderVelocity(AbstractActionInput parentActionInput, Map<String, Object> context, String code) throws QException
-   {
-      return (renderVelocity(context, code));
-   }
-
-
-
    /*******************************************************************************
     ** Most convenient static wrapper to render a Velocity template.
     *******************************************************************************/
-   public static String renderVelocity(Map<String, Object> context, String code) throws QException
+   public static String renderVelocity(AbstractActionInput parentActionInput, Map<String, Object> context, String code) throws QException
    {
       return (render(TemplateType.VELOCITY, context, code));
    }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/values/QValueFormatter.java

@@ -23,8 +23,6 @@ package com.kingsrook.qqq.backend.core.actions.values;
 
 
 import java.io.Serializable;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -34,7 +32,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 import com.kingsrook.qqq.backend.core.context.QContext;
 import com.kingsrook.qqq.backend.core.logging.QLogger;
@@ -71,7 +68,7 @@ public class QValueFormatter
     *******************************************************************************/
    public static String formatValue(QFieldMetaData field, Serializable value)
    {
-      return (formatValue(field.getDisplayFormat(), field.getType(), field.getName(), value));
+      return (formatValue(field.getDisplayFormat(), field.getName(), value));
    }
 
 
@@ -81,7 +78,7 @@ public class QValueFormatter
     *******************************************************************************/
    public static String formatValue(String displayFormat, Serializable value)
    {
-      return (formatValue(displayFormat, null, "", value));
+      return (formatValue(displayFormat, "", value));
    }
 
 
@@ -90,7 +87,7 @@ public class QValueFormatter
     ** For a display format string, an optional fieldName (only used for logging),
     ** and a value, apply the format.
     *******************************************************************************/
-   private static String formatValue(String displayFormat, QFieldType fieldType, String fieldName, Serializable value)
+   private static String formatValue(String displayFormat, String fieldName, Serializable value)
    {
       //////////////////////////////////
       // null values get null results //
@@ -110,11 +107,6 @@ public class QValueFormatter
             return formatBoolean(b);
          }
 
-         if(QFieldType.BOOLEAN.equals(fieldType))
-         {
-            return formatBoolean(ValueUtils.getValueAsBoolean(value));
-         }
-
          if(value instanceof LocalTime lt)
          {
             return formatLocalTime(lt);
@@ -412,7 +404,6 @@ public class QValueFormatter
    }
 
 
-
    /*******************************************************************************
     ** For a single record, set its display values - where caller (meant to stay private)
     ** can specify if they've already done fieldBehaviors (to avoid re-doing).
@@ -471,8 +462,7 @@ public class QValueFormatter
    {
       for(QFieldMetaData field : table.getFields().values())
       {
-         Optional<FieldAdornment> fileDownloadAdornment = field.getAdornment(AdornmentType.FILE_DOWNLOAD);
-         if(fileDownloadAdornment.isPresent())
+         if(field.getType().equals(QFieldType.BLOB))
          {
             //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             // file name comes from:                                                                                            //
@@ -482,7 +472,20 @@ public class QValueFormatter
             // - tableLabel primaryKey fieldLabel                                                                               //
             // - and - if the FILE_DOWNLOAD adornment had a DEFAULT_EXTENSION, then it gets added (preceded by a dot)           //
             //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            Map<String, Serializable> adornmentValues = fileDownloadAdornment.get().getValues();
+            Optional<FieldAdornment>  fileDownloadAdornment = field.getAdornment(AdornmentType.FILE_DOWNLOAD);
+            Map<String, Serializable> adornmentValues       = Collections.emptyMap();
+
+            if(fileDownloadAdornment.isPresent())
+            {
+               adornmentValues = fileDownloadAdornment.get().getValues();
+            }
+            else
+            {
+               ///////////////////////////////////////////////////////
+               // don't change blobs unless they are file-downloads //
+               ///////////////////////////////////////////////////////
+               continue;
+            }
 
             String fileNameField    = ValueUtils.getValueAsString(adornmentValues.get(AdornmentType.FileDownloadValues.FILE_NAME_FIELD));
             String fileNameFormat   = ValueUtils.getValueAsString(adornmentValues.get(AdornmentType.FileDownloadValues.FILE_NAME_FORMAT));
@@ -512,7 +515,7 @@ public class QValueFormatter
                   {
                      @SuppressWarnings("unchecked") // instance validation should make this safe!
                      List<String> fileNameFormatFields = (List<String>) adornmentValues.get(AdornmentType.FileDownloadValues.FILE_NAME_FORMAT_FIELDS);
-                     List<String> values = CollectionUtils.nullSafeHasContents(fileNameFormatFields) ? fileNameFormatFields.stream().map(f -> ValueUtils.getValueAsString(record.getValue(f))).toList() : Collections.emptyList();
+                     List<String> values = fileNameFormatFields.stream().map(f -> ValueUtils.getValueAsString(record.getValue(f))).toList();
                      fileName = QValueFormatter.formatStringWithValues(fileNameFormat, values);
                   }
                }
@@ -533,22 +536,7 @@ public class QValueFormatter
                   }
                }
 
-               ////////////////////////////////////////////////////////////////////////////////////////////////
-               // if field type is blob OR if there's a supplemental process or code-ref that needs to run - //
-               // then update its value to be a callback-url that'll give access to the bytes to download.   //
-               // implied here is that a String value (w/o supplemental code/proc) has its value stay as a   //
-               // URL, which is where the file is directly downloaded from.  And in the case of a String     //
-               // with code-to-run, then the code should run, followed by a redirect to the value URL.       //
-               ////////////////////////////////////////////////////////////////////////////////////////////////
-               if(QFieldType.BLOB.equals(field.getType())
-                  || adornmentValues.containsKey(AdornmentType.FileDownloadValues.SUPPLEMENTAL_CODE_REFERENCE)
-                  || adornmentValues.containsKey(AdornmentType.FileDownloadValues.SUPPLEMENTAL_PROCESS_NAME))
-               {
-                  record.setValue(field.getName(), "/data/" + table.getName() + "/"
-                     + URLEncoder.encode(ValueUtils.getValueAsString(primaryKey), StandardCharsets.UTF_8) + "/"
-                     + field.getName() + "/"
-                     + URLEncoder.encode(Objects.requireNonNullElse(fileName, ""), StandardCharsets.UTF_8));
-               }
+               record.setValue(field.getName(), "/data/" + table.getName() + "/" + primaryKey + "/" + field.getName() + "/" + fileName);
                record.setDisplayValue(field.getName(), fileName);
             }
          }
@@ -575,7 +563,6 @@ public class QValueFormatter
             /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
             // heavy fields that weren't fetched - they should have a backend-detail specifying their length (or null if null) //
             /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            @SuppressWarnings("unchecked")
             Map<String, Serializable> heavyFieldLengths = (Map<String, Serializable>) record.getBackendDetail(QRecord.BACKEND_DETAILS_TYPE_HEAVY_FIELD_LENGTHS);
             if(heavyFieldLengths != null)
             {

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/values/SearchPossibleValueSourceAction.java

@@ -26,15 +26,10 @@ import java.io.Serializable;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
 import com.kingsrook.qqq.backend.core.actions.customizers.QCodeLoader;
 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.tables.query.QCriteriaOperator;
@@ -54,7 +49,7 @@ 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.StringUtils;
 import com.kingsrook.qqq.backend.core.utils.ValueUtils;
-import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
+import org.apache.commons.lang.NotImplementedException;
 
 
 /*******************************************************************************
@@ -65,9 +60,6 @@ public class SearchPossibleValueSourceAction
 {
    private static final QLogger LOG = QLogger.getLogger(SearchPossibleValueSourceAction.class);
 
-   private static final Set<String> warnedAboutUnexpectedValueField                = Collections.synchronizedSet(new HashSet<>());
-   private static final Set<String> warnedAboutUnexpectedNoOfFieldsToSearchByLabel = Collections.synchronizedSet(new HashSet<>());
-
    private QPossibleValueTranslator possibleValueTranslator;
 
 
@@ -77,14 +69,14 @@ public class SearchPossibleValueSourceAction
     *******************************************************************************/
    public SearchPossibleValueSourceOutput execute(SearchPossibleValueSourceInput input) throws QException
    {
-      QInstance            qInstance           = QContext.getQInstance();
+      QInstance            qInstance           = input.getInstance();
       QPossibleValueSource possibleValueSource = qInstance.getPossibleValueSource(input.getPossibleValueSourceName());
       if(possibleValueSource == null)
       {
          throw new QException("Missing possible value source named [" + input.getPossibleValueSourceName() + "]");
       }
 
-      possibleValueTranslator = new QPossibleValueTranslator(QContext.getQInstance(), QContext.getQSession());
+      possibleValueTranslator = new QPossibleValueTranslator(input.getInstance(), input.getSession());
       SearchPossibleValueSourceOutput output = null;
       if(possibleValueSource.getType().equals(QPossibleValueSourceType.ENUM))
       {
@@ -117,7 +109,6 @@ public class SearchPossibleValueSourceAction
       List<Serializable>              matchingIds = new ArrayList<>();
 
       List<?> inputIdsAsCorrectType = convertInputIdsToEnumIdType(possibleValueSource, input.getIdList());
-      Set<String> labels = null;
 
       for(QPossibleValue<?> possibleValue : possibleValueSource.getEnumValues())
       {
@@ -130,24 +121,12 @@ public class SearchPossibleValueSourceAction
                match = true;
             }
          }
-         else if(input.getLabelList() != null)
-         {
-            if(labels == null)
-            {
-               labels = input.getLabelList().stream().filter(Objects::nonNull).map(l -> l.toLowerCase()).collect(Collectors.toSet());
-            }
-
-            if(labels.contains(possibleValue.getLabel().toLowerCase()))
-            {
-               match = true;
-            }
-         }
          else
          {
             if(StringUtils.hasContent(input.getSearchTerm()))
             {
                match = (Objects.equals(ValueUtils.getValueAsString(possibleValue.getId()).toLowerCase(), input.getSearchTerm().toLowerCase())
-                        || possibleValue.getLabel().toLowerCase().startsWith(input.getSearchTerm().toLowerCase()));
+                  || possibleValue.getLabel().toLowerCase().startsWith(input.getSearchTerm().toLowerCase()));
             }
             else
             {
@@ -188,37 +167,21 @@ public class SearchPossibleValueSourceAction
 
       Object anIdFromTheEnum = possibleValueSource.getEnumValues().get(0).getId();
 
-      for(Serializable inputId : inputIdList)
+      if(anIdFromTheEnum instanceof Integer)
       {
-         Object properlyTypedId = null;
-         try
-         {
-            if(anIdFromTheEnum instanceof Integer)
-            {
-               properlyTypedId = ValueUtils.getValueAsInteger(inputId);
-            }
-            else if(anIdFromTheEnum instanceof String)
-            {
-               properlyTypedId = ValueUtils.getValueAsString(inputId);
-            }
-            else if(anIdFromTheEnum instanceof Boolean)
-            {
-               properlyTypedId = ValueUtils.getValueAsBoolean(inputId);
-            }
-            else
-            {
-               LOG.warn("Unexpected type [" + anIdFromTheEnum.getClass().getSimpleName() + "] for ids in enum: " + possibleValueSource.getName());
-            }
-         }
-         catch(Exception e)
-         {
-            LOG.debug("Error converting possible value id to expected id type", e, logPair("value", inputId));
-         }
-
-         if (properlyTypedId != null)
-         {
-            rs.add(properlyTypedId);
-         }
+         inputIdList.forEach(id -> rs.add(ValueUtils.getValueAsInteger(id)));
+      }
+      else if(anIdFromTheEnum instanceof String)
+      {
+         inputIdList.forEach(id -> rs.add(ValueUtils.getValueAsString(id)));
+      }
+      else if(anIdFromTheEnum instanceof Boolean)
+      {
+         inputIdList.forEach(id -> rs.add(ValueUtils.getValueAsBoolean(id)));
+      }
+      else
+      {
+         LOG.warn("Unexpected type [" + anIdFromTheEnum.getClass().getSimpleName() + "] for ids in enum: " + possibleValueSource.getName());
       }
 
       return (rs);
@@ -236,7 +199,7 @@ public class SearchPossibleValueSourceAction
       QueryInput queryInput = new QueryInput();
       queryInput.setTableName(possibleValueSource.getTableName());
 
-      QTableMetaData table = QContext.getQInstance().getTable(possibleValueSource.getTableName());
+      QTableMetaData table = input.getInstance().getTable(possibleValueSource.getTableName());
 
       QQueryFilter queryFilter = new QQueryFilter();
       queryFilter.setBooleanOperator(QQueryFilter.BooleanOperator.OR);
@@ -245,53 +208,6 @@ public class SearchPossibleValueSourceAction
       {
          queryFilter.addCriteria(new QFilterCriteria(table.getPrimaryKeyField(), QCriteriaOperator.IN, input.getIdList()));
       }
-      else if(input.getLabelList() != null)
-      {
-         List<String> fieldNames = new ArrayList<>();
-
-         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-         // the 'value fields' will either be 'id' or 'label' (which means, use the fields from the tableMetaData's label fields) //
-         ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-         for(String valueField : possibleValueSource.getValueFields())
-         {
-            if("id".equals(valueField))
-            {
-               fieldNames.add(table.getPrimaryKeyField());
-            }
-            else if("label".equals(valueField))
-            {
-               if(table.getRecordLabelFields() != null)
-               {
-                  fieldNames.addAll(table.getRecordLabelFields());
-               }
-            }
-            else
-            {
-               String message = "Unexpected valueField defined in possibleValueSource when searching possibleValueSource by label (required: 'id' or 'label')";
-               if(!warnedAboutUnexpectedValueField.contains(possibleValueSource.getName()))
-               {
-                  LOG.warn(message, logPair("valueField", valueField), logPair("possibleValueSource", possibleValueSource.getName()));
-                  warnedAboutUnexpectedValueField.add(possibleValueSource.getName());
-               }
-               output.setWarning(message);
-            }
-         }
-
-         if(fieldNames.size() == 1)
-         {
-            queryFilter.addCriteria(new QFilterCriteria(fieldNames.get(0), QCriteriaOperator.IN, input.getLabelList()));
-         }
-         else
-         {
-            String message = "Unexpected number of fields found for searching possibleValueSource by label (required: 1, found: " + fieldNames.size() + ")";
-            if(!warnedAboutUnexpectedNoOfFieldsToSearchByLabel.contains(possibleValueSource.getName()))
-            {
-               LOG.warn(message);
-               warnedAboutUnexpectedNoOfFieldsToSearchByLabel.add(possibleValueSource.getName());
-            }
-            output.setWarning(message);
-         }
-      }
       else
       {
          String searchTerm = input.getSearchTerm();
@@ -343,6 +259,9 @@ public class SearchPossibleValueSourceAction
          }
       }
 
+      // todo - skip & limit as params
+      queryFilter.setLimit(250);
+
       ///////////////////////////////////////////////////////////////////////////////////////////////////////
       // if given a default filter, make it the 'top level' filter and the one we just created a subfilter //
       ///////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -352,9 +271,6 @@ public class SearchPossibleValueSourceAction
          queryFilter = input.getDefaultQueryFilter();
       }
 
-      queryFilter.setLimit(input.getLimit());
-      queryFilter.setSkip(input.getSkip());
-
       queryFilter.setOrderBys(possibleValueSource.getOrderByFields());
 
       queryInput.setFilter(queryFilter);
@@ -371,7 +287,7 @@ public class SearchPossibleValueSourceAction
          fieldName = table.getPrimaryKeyField();
       }
 
-      List<Serializable>      ids             = queryOutput.getRecords().stream().map(r -> r.getValue(fieldName)).toList();
+      List<Serializable> ids = queryOutput.getRecords().stream().map(r -> r.getValue(fieldName)).toList();
       List<QPossibleValue<?>> qPossibleValues = possibleValueTranslator.buildTranslatedPossibleValueList(possibleValueSource, ids);
       output.setResults(qPossibleValues);
 
@@ -383,8 +299,7 @@ public class SearchPossibleValueSourceAction
    /*******************************************************************************
     **
     *******************************************************************************/
-   @SuppressWarnings({ "rawtypes", "unchecked" })
-   private SearchPossibleValueSourceOutput searchPossibleValueCustom(SearchPossibleValueSourceInput input, QPossibleValueSource possibleValueSource) throws QException
+   private SearchPossibleValueSourceOutput searchPossibleValueCustom(SearchPossibleValueSourceInput input, QPossibleValueSource possibleValueSource)
    {
       try
       {
@@ -397,10 +312,11 @@ public class SearchPossibleValueSourceAction
       }
       catch(Exception e)
       {
-         String message = "Error sending searching custom possible value source [" + input.getPossibleValueSourceName() + "]";
-         LOG.warn(message, e);
-         throw (new QException(message));
+         // LOG.warn("Error sending [" + value + "] for field [" + field + "] through custom code for PVS [" + field.getPossibleValueSourceName() + "]", e);
       }
+
+      throw new NotImplementedException("Not impleemnted");
+      // return (null);
    }
 
 }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/values/ValueBehaviorApplier.java

@@ -22,18 +22,12 @@
 package com.kingsrook.qqq.backend.core.actions.values;
 
 
-import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.Set;
-import com.kingsrook.qqq.backend.core.model.actions.tables.query.QFilterCriteria;
-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.QInstance;
 import com.kingsrook.qqq.backend.core.model.metadata.fields.FieldBehavior;
 import com.kingsrook.qqq.backend.core.model.metadata.fields.FieldDisplayBehavior;
-import com.kingsrook.qqq.backend.core.model.metadata.fields.FieldFilterBehavior;
 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;
@@ -52,7 +46,6 @@ public class ValueBehaviorApplier
    {
       INSERT,
       UPDATE,
-      READ,
       FORMATTING
    }
 
@@ -104,169 +97,4 @@ public class ValueBehaviorApplier
       }
    }
 
-
-
-   /*******************************************************************************
-    ** apply field behaviors (of FieldFilterBehavior type) to a QQueryFilter.
-    ** note that, we don't like to ever edit a QQueryFilter itself (e.g., as it might
-    ** have come from meta-data, or it might have some immutable structures in it).
-    ** So, if any changes are needed, they'll be returned in a clone.
-    ** So, either way, you should use this method like:
-    *
-    ** QQueryFilter myFilter = // wherever I got my filter from
-    ** myFilter = ValueBehaviorApplier.applyFieldBehaviorsToFilter(QContext.getInstance, table, myFilter, null);
-    ** // e.g., always re-assign over top of your filter.
-    *******************************************************************************/
-   public static QQueryFilter applyFieldBehaviorsToFilter(QInstance instance, QTableMetaData table, QQueryFilter filter, Set<FieldBehavior<?>> behaviorsToOmit)
-   {
-      ////////////////////////////////////////////////
-      // for null or empty filter, return the input //
-      ////////////////////////////////////////////////
-      if(filter == null || !filter.hasAnyCriteria())
-      {
-         return (filter);
-      }
-
-      ///////////////////////////////////////////////////////////////////
-      // track if we need to make & return a clone.                    //
-      // which will be the case if we get back any different criteria, //
-      // or any different sub-filters, than what we originally had.    //
-      ///////////////////////////////////////////////////////////////////
-      boolean needToUseClone = false;
-
-      ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-      // make a new criteria list, and a new subFilter list - either null, if the source was null, or a new array list //
-      ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-      List<QFilterCriteria> newCriteriaList = filter.getCriteria() == null ? null : new ArrayList<>();
-      List<QQueryFilter>    newSubFilters   = filter.getSubFilters() == null ? null : new ArrayList<>();
-
-      //////////////////////////////////////////////////////////////////////////////
-      // for each criteria, if its field has any applicable behaviors, apply them //
-      //////////////////////////////////////////////////////////////////////////////
-      for(QFilterCriteria criteria : CollectionUtils.nonNullList(filter.getCriteria()))
-      {
-         QFieldMetaData field = table.getFields().get(criteria.getFieldName());
-         if(field == null && criteria.getFieldName() != null && criteria.getFieldName().contains("."))
-         {
-            String[] parts = criteria.getFieldName().split("\\.");
-            if(parts.length == 2)
-            {
-               QTableMetaData joinTable = instance.getTable(parts[0]);
-               if(joinTable != null)
-               {
-                  field = joinTable.getFields().get(parts[1]);
-               }
-            }
-         }
-
-         QFilterCriteria criteriaToUse = criteria;
-         if(field != null)
-         {
-            for(FieldBehavior<?> fieldBehavior : CollectionUtils.nonNullCollection(field.getBehaviors()))
-            {
-               boolean applyBehavior = true;
-               if(behaviorsToOmit != null && behaviorsToOmit.contains(fieldBehavior))
-               {
-                  applyBehavior = false;
-               }
-
-               if(applyBehavior && fieldBehavior instanceof FieldFilterBehavior<?> filterBehavior)
-               {
-                  //////////////////////////////////////////////////////////////////////
-                  // call to apply the behavior on the criteria - which will return a //
-                  // new criteria if any values are changed, else the input criteria  //
-                  //////////////////////////////////////////////////////////////////////
-                  criteriaToUse = apply(criteriaToUse, instance, table, field, filterBehavior);
-
-                  ////////////////////////////////////////////////////////////////////////////////////////////////////////////
-                  // if the new criteria is not the same as the old criteria, mark that we need to make and return a clone. //
-                  ////////////////////////////////////////////////////////////////////////////////////////////////////////////
-                  if(criteriaToUse != criteria)
-                  {
-                     needToUseClone = true;
-                  }
-               }
-            }
-         }
-
-         newCriteriaList.add(criteriaToUse);
-      }
-
-      /////////////////////////////////////////////////////////////////////////////////////////////////
-      // similar to above - iterate over the subfilters, making a recursive call, and tracking if we //
-      // got back the same object (in which case, there are no changes, and we don't need to clone), //
-      // or a different object (in which case, we do need a clone, because there were changes).      //
-      /////////////////////////////////////////////////////////////////////////////////////////////////
-      for(QQueryFilter subFilter : CollectionUtils.nonNullList(filter.getSubFilters()))
-      {
-         QQueryFilter newSubFilter = applyFieldBehaviorsToFilter(instance, table, subFilter, behaviorsToOmit);
-         if(newSubFilter != subFilter)
-         {
-            newSubFilters.add(newSubFilter);
-            needToUseClone = true;
-         }
-         else
-         {
-            newSubFilters.add(subFilter);
-         }
-      }
-
-      //////////////////////////////////////////////////////////////////////////////////////////////////
-      // if we need to return a clone, then do so, replacing the lists with the ones we built in here //
-      //////////////////////////////////////////////////////////////////////////////////////////////////
-      if(needToUseClone)
-      {
-         QQueryFilter cloneFilter = filter.clone();
-         cloneFilter.setCriteria(newCriteriaList);
-         cloneFilter.setSubFilters(newSubFilters);
-         return (cloneFilter);
-      }
-
-      /////////////////////////////////////////////////////////////////////////////
-      // else, if no clone needed (e.g., no changes), return the original filter //
-      /////////////////////////////////////////////////////////////////////////////
-      return (filter);
-   }
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   public static QFilterCriteria apply(QFilterCriteria criteria, QInstance instance, QTableMetaData table, QFieldMetaData field, FieldFilterBehavior<?> filterBehavior)
-   {
-      if(criteria == null || CollectionUtils.nullSafeIsEmpty(criteria.getValues()))
-      {
-         return (criteria);
-      }
-
-      List<Serializable> newValues  = new ArrayList<>();
-      boolean            changedAny = false;
-
-      for(Serializable value : criteria.getValues())
-      {
-         Serializable newValue = filterBehavior.applyToFilterCriteriaValue(value, instance, table, field);
-         if(!Objects.equals(value, newValue))
-         {
-            newValues.add(newValue);
-            changedAny = true;
-         }
-         else
-         {
-            newValues.add(value);
-         }
-      }
-
-      if(changedAny)
-      {
-         QFilterCriteria clone = criteria.clone();
-         clone.setValues(newValues);
-         return (clone);
-      }
-      else
-      {
-         return (criteria);
-      }
-   }
-
 }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/exceptions/QInstanceValidationException.java

@@ -22,8 +22,8 @@
 package com.kingsrook.qqq.backend.core.exceptions;
 
 
+import java.util.Arrays;
 import java.util.List;
-import com.kingsrook.qqq.backend.core.utils.CollectionUtils;
 import com.kingsrook.qqq.backend.core.utils.StringUtils;
 
 
@@ -55,11 +55,12 @@ public class QInstanceValidationException extends QException
     *******************************************************************************/
    public QInstanceValidationException(List<String> reasons)
    {
-      super((CollectionUtils.nullSafeHasContents(reasons))
-         ? "Instance validation failed for the following reasons:\n - " + StringUtils.join("\n - ", reasons) + "\n(" + reasons.size() + " Total reason" + StringUtils.plural(reasons) + ")"
-         : "Validation failed, but no reasons were provided");
+      super(
+         (reasons != null && reasons.size() > 0)
+            ? "Instance validation failed for the following reasons:\n - " + StringUtils.join("\n - ", reasons)
+            : "Validation failed, but no reasons were provided");
 
-      if(CollectionUtils.nullSafeHasContents(reasons))
+      if(reasons != null && reasons.size() > 0)
       {
          this.reasons = reasons;
       }
@@ -67,6 +68,25 @@ public class QInstanceValidationException extends QException
 
 
 
+   /*******************************************************************************
+    ** Constructor of an array/varargs of reasons.  They feed into the core exception message.
+    **
+    *******************************************************************************/
+   public QInstanceValidationException(String... reasons)
+   {
+      super(
+         (reasons != null && reasons.length > 0)
+            ? "Instance validation failed for the following reasons:  " + StringUtils.joinWithCommasAndAnd(Arrays.stream(reasons).toList())
+            : "Validation failed, but no reasons were provided");
+
+      if(reasons != null && reasons.length > 0)
+      {
+         this.reasons = Arrays.stream(reasons).toList();
+      }
+   }
+
+
+
    /*******************************************************************************
     ** Constructor of message & cause - does not populate reasons!
     **

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/instances/AbstractMetaDataProducerBasedQQQApplication.java

@@ -1,55 +0,0 @@
-/*
- * QQQ - Low-code Application Framework for Engineers.
- * Copyright (C) 2021-2024.  Kingsrook, LLC
- * 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States
- * contact@kingsrook.com
- * https://github.com/Kingsrook/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.kingsrook.qqq.backend.core.instances;
-
-
-import com.kingsrook.qqq.backend.core.exceptions.QException;
-import com.kingsrook.qqq.backend.core.model.metadata.MetaDataProducerHelper;
-import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
-
-
-/*******************************************************************************
- ** Version of AbstractQQQApplication that assumes all meta-data is produced
- ** by MetaDataProducers in a single package.
- *******************************************************************************/
-public abstract class AbstractMetaDataProducerBasedQQQApplication extends AbstractQQQApplication
-{
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   public abstract String getMetaDataPackageName();
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   @Override
-   public QInstance defineQInstance() throws QException
-   {
-      QInstance qInstance = new QInstance();
-      MetaDataProducerHelper.processAllMetaDataProducersInPackage(qInstance, getMetaDataPackageName());
-      return (qInstance);
-   }
-
-}

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/instances/AbstractQQQApplication.java

@@ -1,78 +0,0 @@
-/*
- * QQQ - Low-code Application Framework for Engineers.
- * Copyright (C) 2021-2024.  Kingsrook, LLC
- * 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States
- * contact@kingsrook.com
- * https://github.com/Kingsrook/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.kingsrook.qqq.backend.core.instances;
-
-
-import java.util.ArrayList;
-import java.util.List;
-import com.kingsrook.qqq.backend.core.exceptions.QException;
-import com.kingsrook.qqq.backend.core.exceptions.QInstanceValidationException;
-import com.kingsrook.qqq.backend.core.instances.validation.plugins.QInstanceValidatorPluginInterface;
-import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
-import com.kingsrook.qqq.backend.core.utils.CollectionUtils;
-
-
-/*******************************************************************************
- ** Base class to provide the definition of a QQQ-based application.
- **
- ** Essentially, just how to define its meta-data - in the form of a QInstance.
- **
- ** Also provides means to define the instance validation plugins to be used.
- *******************************************************************************/
-public abstract class AbstractQQQApplication
-{
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   public abstract QInstance defineQInstance() throws QException;
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   public QInstance defineValidatedQInstance() throws QException, QInstanceValidationException
-   {
-      QInstance qInstance = defineQInstance();
-
-      QInstanceValidator.removeAllValidatorPlugins();
-      for(QInstanceValidatorPluginInterface<?> validatorPlugin : CollectionUtils.nonNullList(getValidatorPlugins()))
-      {
-         QInstanceValidator.addValidatorPlugin(validatorPlugin);
-      }
-
-      QInstanceValidator qInstanceValidator = new QInstanceValidator();
-      qInstanceValidator.validate(qInstance);
-      return (qInstance);
-   }
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   protected List<QInstanceValidatorPluginInterface<?>> getValidatorPlugins()
-   {
-      return new ArrayList<>();
-   }
-}

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/instances/QInstanceEnricher.java

@@ -23,11 +23,7 @@ package com.kingsrook.qqq.backend.core.instances;
 
 
 import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -35,27 +31,21 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
-import com.kingsrook.qqq.backend.core.actions.customizers.QCodeLoader;
 import com.kingsrook.qqq.backend.core.actions.metadata.JoinGraph;
 import com.kingsrook.qqq.backend.core.actions.permissions.BulkTableActionProcessPermissionChecker;
-import com.kingsrook.qqq.backend.core.actions.values.QCustomPossibleValueProvider;
 import com.kingsrook.qqq.backend.core.exceptions.QException;
-import com.kingsrook.qqq.backend.core.instances.enrichment.plugins.QInstanceEnricherPluginInterface;
 import com.kingsrook.qqq.backend.core.logging.QLogger;
 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.code.QCodeReference;
 import com.kingsrook.qqq.backend.core.model.metadata.dashboard.QWidgetMetaDataInterface;
 import com.kingsrook.qqq.backend.core.model.metadata.fields.AdornmentType;
-import com.kingsrook.qqq.backend.core.model.metadata.fields.AdornmentType.FileUploadAdornment;
 import com.kingsrook.qqq.backend.core.model.metadata.fields.DynamicDefaultValueBehavior;
 import com.kingsrook.qqq.backend.core.model.metadata.fields.FieldAdornment;
 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.joins.QJoinMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.layout.QAppChildMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.layout.QAppMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.layout.QAppSection;
@@ -64,12 +54,10 @@ import com.kingsrook.qqq.backend.core.model.metadata.permissions.MetaDataWithPer
 import com.kingsrook.qqq.backend.core.model.metadata.permissions.QPermissionRules;
 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.processes.QBackendStepMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.processes.QComponentType;
 import com.kingsrook.qqq.backend.core.model.metadata.processes.QFrontendComponentMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.processes.QFrontendStepMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.processes.QProcessMetaData;
-import com.kingsrook.qqq.backend.core.model.metadata.processes.QStateMachineStep;
 import com.kingsrook.qqq.backend.core.model.metadata.processes.QStepMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.processes.QSupplementalProcessMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.reporting.QReportDataSource;
@@ -86,11 +74,6 @@ import com.kingsrook.qqq.backend.core.processes.implementations.bulk.edit.BulkEd
 import com.kingsrook.qqq.backend.core.processes.implementations.bulk.edit.BulkEditTransformStep;
 import com.kingsrook.qqq.backend.core.processes.implementations.bulk.insert.BulkInsertExtractStep;
 import com.kingsrook.qqq.backend.core.processes.implementations.bulk.insert.BulkInsertLoadStep;
-import com.kingsrook.qqq.backend.core.processes.implementations.bulk.insert.BulkInsertPrepareFileMappingStep;
-import com.kingsrook.qqq.backend.core.processes.implementations.bulk.insert.BulkInsertPrepareFileUploadStep;
-import com.kingsrook.qqq.backend.core.processes.implementations.bulk.insert.BulkInsertPrepareValueMappingStep;
-import com.kingsrook.qqq.backend.core.processes.implementations.bulk.insert.BulkInsertReceiveFileMappingStep;
-import com.kingsrook.qqq.backend.core.processes.implementations.bulk.insert.BulkInsertReceiveValueMappingStep;
 import com.kingsrook.qqq.backend.core.processes.implementations.bulk.insert.BulkInsertTransformStep;
 import com.kingsrook.qqq.backend.core.processes.implementations.etl.streamedwithfrontend.ExtractViaQueryStep;
 import com.kingsrook.qqq.backend.core.processes.implementations.etl.streamedwithfrontend.StreamedETLWithFrontendProcess;
@@ -98,7 +81,6 @@ import com.kingsrook.qqq.backend.core.scheduler.QScheduleManager;
 import com.kingsrook.qqq.backend.core.utils.CollectionUtils;
 import com.kingsrook.qqq.backend.core.utils.ListingHash;
 import com.kingsrook.qqq.backend.core.utils.StringUtils;
-import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
 
 
 /*******************************************************************************
@@ -124,8 +106,6 @@ public class QInstanceEnricher
    //////////////////////////////////////////////////////////////////////////////////////////////////
    private static final Map<String, String> labelMappings = new LinkedHashMap<>();
 
-   private static ListingHash<Class<?>, QInstanceEnricherPluginInterface<?>> enricherPlugins = new ListingHash<>();
-
 
 
    /*******************************************************************************
@@ -143,18 +123,6 @@ public class QInstanceEnricher
     *******************************************************************************/
    public void enrich()
    {
-      /////////////////////////////////////////////////////////////////////////////////////////
-      // at one point, we did apps later - but - it was possible to put tables in an app's   //
-      // sections, but not its children list (enrichApp fixes this by adding such tables to  //
-      // the children list) so then when enrichTable runs, it looks for fields that are      //
-      // possible-values pointed at tables,  for adding LINK adornments - and that could     //
-      // cause such links to be omitted, mysteriously!  so, do app enrichment before tables. //
-      /////////////////////////////////////////////////////////////////////////////////////////
-      if(qInstance.getApps() != null)
-      {
-         qInstance.getApps().values().forEach(this::enrichApp);
-      }
-
       if(qInstance.getTables() != null)
       {
          qInstance.getTables().values().forEach(this::enrichTable);
@@ -171,6 +139,11 @@ public class QInstanceEnricher
          qInstance.getBackends().values().forEach(this::enrichBackend);
       }
 
+      if(qInstance.getApps() != null)
+      {
+         qInstance.getApps().values().forEach(this::enrichApp);
+      }
+
       if(qInstance.getReports() != null)
       {
          qInstance.getReports().values().forEach(this::enrichReport);
@@ -187,7 +160,6 @@ public class QInstanceEnricher
       }
 
       enrichJoins();
-      enrichInstance();
 
       //////////////////////////////////////////////////////////////////////////////
       // if the instance DOES have 1 or more scheduler, but no schedulable types, //
@@ -204,16 +176,6 @@ public class QInstanceEnricher
 
 
 
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   private void enrichInstance()
-   {
-      runPlugins(QInstance.class, qInstance, qInstance);
-   }
-
-
-
    /*******************************************************************************
     **
     *******************************************************************************/
@@ -278,14 +240,6 @@ public class QInstanceEnricher
                }
             }
          }
-
-         ///////////////////////////////////////////
-         // run plugins on joins if there are any //
-         ///////////////////////////////////////////
-         for(QJoinMetaData join : qInstance.getJoins().values())
-         {
-            runPlugins(QJoinMetaData.class, join, qInstance);
-         }
       }
       catch(Exception e)
       {
@@ -301,7 +255,6 @@ public class QInstanceEnricher
    private void enrichWidget(QWidgetMetaDataInterface widgetMetaData)
    {
       enrichPermissionRules(widgetMetaData);
-      runPlugins(QWidgetMetaDataInterface.class, widgetMetaData, qInstance);
    }
 
 
@@ -312,7 +265,6 @@ public class QInstanceEnricher
    private void enrichBackend(QBackendMetaData qBackendMetaData)
    {
       qBackendMetaData.enrich();
-      runPlugins(QBackendMetaData.class, qBackendMetaData, qInstance);
    }
 
 
@@ -353,7 +305,6 @@ public class QInstanceEnricher
 
       enrichPermissionRules(table);
       enrichAuditRules(table);
-      runPlugins(QTableMetaData.class, table, qInstance);
    }
 
 
@@ -444,7 +395,6 @@ public class QInstanceEnricher
       }
 
       enrichPermissionRules(process);
-      runPlugins(QProcessMetaData.class, process, qInstance);
    }
 
 
@@ -453,27 +403,10 @@ public class QInstanceEnricher
     **
     *******************************************************************************/
    private void enrichStep(QStepMetaData step)
-   {
-      enrichStep(step, false);
-   }
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   private void enrichStep(QStepMetaData step, boolean isSubStep)
    {
       if(!StringUtils.hasContent(step.getLabel()))
       {
-         if(isSubStep && (step.getName().endsWith(".backend") || step.getName().endsWith(".frontend")))
-         {
-            step.setLabel(nameToLabel(step.getName().replaceFirst("\\.(backend|frontend)", "")));
-         }
-         else
-         {
-            step.setLabel(nameToLabel(step.getName()));
-         }
+         step.setLabel(nameToLabel(step.getName()));
       }
 
       step.getInputFields().forEach(this::enrichField);
@@ -494,13 +427,6 @@ public class QInstanceEnricher
             frontendStepMetaData.getRecordListFields().forEach(this::enrichField);
          }
       }
-      else if(step instanceof QStateMachineStep stateMachineStep)
-      {
-         for(QStepMetaData subStep : CollectionUtils.nonNullList(stateMachineStep.getSubSteps()))
-         {
-            enrichStep(subStep, true);
-         }
-      }
    }
 
 
@@ -566,8 +492,6 @@ public class QInstanceEnricher
             field.withBehavior(DynamicDefaultValueBehavior.MODIFY_DATE);
          }
       }
-
-      runPlugins(QFieldMetaData.class, field, qInstance);
    }
 
 
@@ -639,7 +563,6 @@ public class QInstanceEnricher
       ensureAppSectionMembersAreAppChildren(app);
 
       enrichPermissionRules(app);
-      runPlugins(QAppMetaData.class, app, qInstance);
    }
 
 
@@ -787,7 +710,6 @@ public class QInstanceEnricher
       }
 
       enrichPermissionRules(report);
-      runPlugins(QReportMetaData.class, report, qInstance);
    }
 
 
@@ -879,7 +801,7 @@ public class QInstanceEnricher
    /*******************************************************************************
     **
     *******************************************************************************/
-   public void defineTableBulkInsert(QInstance qInstance, QTableMetaData table, String processName)
+   private void defineTableBulkInsert(QInstance qInstance, QTableMetaData table, String processName)
    {
       Map<String, Serializable> values = new HashMap<>();
       values.put(StreamedETLWithFrontendProcess.FIELD_DESTINATION_TABLE, table.getName());
@@ -891,7 +813,6 @@ public class QInstanceEnricher
             values
          )
          .withName(processName)
-         .withIcon(new QIcon().withName("library_add"))
          .withLabel(table.getLabel() + " Bulk Insert")
          .withTableName(table.getName())
          .withIsHidden(true)
@@ -922,76 +843,18 @@ public class QInstanceEnricher
          .map(QFieldMetaData::getLabel)
          .collect(Collectors.joining(", "));
 
-      QBackendStepMetaData prepareFileUploadStep = new QBackendStepMetaData()
-         .withName("prepareFileUpload")
-         .withCode(new QCodeReference(BulkInsertPrepareFileUploadStep.class));
-
       QFrontendStepMetaData uploadScreen = new QFrontendStepMetaData()
          .withName("upload")
          .withLabel("Upload File")
-         .withFormField(new QFieldMetaData("theFile", QFieldType.BLOB)
-            .withFieldAdornment(FileUploadAdornment.newFieldAdornment()
-               .withValue(FileUploadAdornment.formatDragAndDrop())
-               .withValue(FileUploadAdornment.widthFull()))
-            .withLabel(table.getLabel() + " File")
-            .withIsRequired(true))
-         .withComponent(new QFrontendComponentMetaData().withType(QComponentType.HTML))
+         .withFormField(new QFieldMetaData("theFile", QFieldType.BLOB).withLabel(table.getLabel() + " File").withIsRequired(true))
+         .withComponent(new QFrontendComponentMetaData()
+            .withType(QComponentType.HELP_TEXT)
+            .withValue("previewText", "file upload instructions")
+            .withValue("text", "Upload a CSV file with the following columns:\n" + fieldsForHelpText))
          .withComponent(new QFrontendComponentMetaData().withType(QComponentType.EDIT_FORM));
 
-      QBackendStepMetaData prepareFileMappingStep = new QBackendStepMetaData()
-         .withName("prepareFileMapping")
-         .withCode(new QCodeReference(BulkInsertPrepareFileMappingStep.class));
-
-      QFrontendStepMetaData fileMappingScreen = new QFrontendStepMetaData()
-         .withName("fileMapping")
-         .withLabel("File Mapping")
-         .withBackStepName("prepareFileUpload")
-         .withComponent(new QFrontendComponentMetaData().withType(QComponentType.BULK_LOAD_FILE_MAPPING_FORM))
-         .withFormField(new QFieldMetaData("hasHeaderRow", QFieldType.BOOLEAN))
-         .withFormField(new QFieldMetaData("layout", QFieldType.STRING)); // is actually PVS, but, this field is only added to help support helpContent, so :shrug:
-
-      QBackendStepMetaData receiveFileMappingStep = new QBackendStepMetaData()
-         .withName("receiveFileMapping")
-         .withCode(new QCodeReference(BulkInsertReceiveFileMappingStep.class));
-
-      QBackendStepMetaData prepareValueMappingStep = new QBackendStepMetaData()
-         .withName("prepareValueMapping")
-         .withCode(new QCodeReference(BulkInsertPrepareValueMappingStep.class));
-
-      QFrontendStepMetaData valueMappingScreen = new QFrontendStepMetaData()
-         .withName("valueMapping")
-         .withLabel("Value Mapping")
-         .withBackStepName("prepareFileMapping")
-         .withComponent(new QFrontendComponentMetaData().withType(QComponentType.BULK_LOAD_VALUE_MAPPING_FORM));
-
-      QBackendStepMetaData receiveValueMappingStep = new QBackendStepMetaData()
-         .withName("receiveValueMapping")
-         .withCode(new QCodeReference(BulkInsertReceiveValueMappingStep.class));
-
-      int i = 0;
-      process.addStep(i++, prepareFileUploadStep);
-      process.addStep(i++, uploadScreen);
-
-      process.addStep(i++, prepareFileMappingStep);
-      process.addStep(i++, fileMappingScreen);
-      process.addStep(i++, receiveFileMappingStep);
-
-      process.addStep(i++, prepareValueMappingStep);
-      process.addStep(i++, valueMappingScreen);
-      process.addStep(i++, receiveValueMappingStep);
-
-      process.getFrontendStep(StreamedETLWithFrontendProcess.STEP_NAME_REVIEW).setRecordListFields(editableFields);
-
-      //////////////////////////////////////////////////////////////////////////////////////////
-      // put the bulk-load profile form (e.g., for saving it) on the review & result screens) //
-      //////////////////////////////////////////////////////////////////////////////////////////
-      process.getFrontendStep(StreamedETLWithFrontendProcess.STEP_NAME_REVIEW)
-         .withBackStepName("prepareFileMapping")
-         .getComponents().add(0, new QFrontendComponentMetaData().withType(QComponentType.BULK_LOAD_PROFILE_FORM));
-
-      process.getFrontendStep(StreamedETLWithFrontendProcess.STEP_NAME_RESULT)
-         .getComponents().add(0, new QFrontendComponentMetaData().withType(QComponentType.BULK_LOAD_PROFILE_FORM));
-
+      process.addStep(0, uploadScreen);
+      process.getFrontendStep("review").setRecordListFields(editableFields);
       qInstance.addProcess(process);
    }
 
@@ -1386,112 +1249,6 @@ public class QInstanceEnricher
             }
          }
 
-         if(possibleValueSource.getIdType() == null)
-         {
-            QTableMetaData table = qInstance.getTable(possibleValueSource.getTableName());
-            if(table != null)
-            {
-               String         primaryKeyField         = table.getPrimaryKeyField();
-               QFieldMetaData primaryKeyFieldMetaData = table.getFields().get(primaryKeyField);
-               if(primaryKeyFieldMetaData != null)
-               {
-                  possibleValueSource.setIdType(primaryKeyFieldMetaData.getType());
-               }
-            }
-         }
-      }
-      else if(QPossibleValueSourceType.ENUM.equals(possibleValueSource.getType()))
-      {
-         if(possibleValueSource.getIdType() == null)
-         {
-            if(CollectionUtils.nullSafeHasContents(possibleValueSource.getEnumValues()))
-            {
-               Object id = possibleValueSource.getEnumValues().get(0).getId();
-               try
-               {
-                  possibleValueSource.setIdType(QFieldType.fromClass(id.getClass()));
-               }
-               catch(Exception e)
-               {
-                  LOG.warn("Error enriching possible value source with idType based on first enum value", e, logPair("possibleValueSource", possibleValueSource.getName()), logPair("id", id));
-               }
-            }
-         }
-      }
-      else if(QPossibleValueSourceType.CUSTOM.equals(possibleValueSource.getType()))
-      {
-         if(possibleValueSource.getIdType() == null)
-         {
-            try
-            {
-               QCustomPossibleValueProvider<?> customPossibleValueProvider = QCodeLoader.getCustomPossibleValueProvider(possibleValueSource);
-
-               Method getPossibleValueMethod = customPossibleValueProvider.getClass().getDeclaredMethod("getPossibleValue", Serializable.class);
-               Type   returnType             = getPossibleValueMethod.getGenericReturnType();
-               Type   idType                 = ((ParameterizedType) returnType).getActualTypeArguments()[0];
-
-               if(idType instanceof Class<?> c)
-               {
-                  possibleValueSource.setIdType(QFieldType.fromClass(c));
-               }
-            }
-            catch(Exception e)
-            {
-               LOG.warn("Error enriching possible value source with idType based on first custom value", e, logPair("possibleValueSource", possibleValueSource.getName()));
-            }
-         }
-      }
-
-      runPlugins(QPossibleValueSource.class, possibleValueSource, qInstance);
-   }
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   public static void addEnricherPlugin(QInstanceEnricherPluginInterface<?> plugin)
-   {
-      Optional<Method> enrichMethod = Arrays.stream(plugin.getClass().getDeclaredMethods())
-         .filter(m -> m.getName().equals("enrich")
-            && m.getParameterCount() == 2
-            && !m.getParameterTypes()[0].equals(Object.class)
-            && m.getParameterTypes()[1].equals(QInstance.class)
-         ).findFirst();
-
-      if(enrichMethod.isPresent())
-      {
-         Class<?> parameterType = enrichMethod.get().getParameterTypes()[0];
-         enricherPlugins.add(parameterType, plugin);
-      }
-      else
-      {
-         LOG.warn("Could not find enrich method on enricher plugin [" + plugin.getClass().getName() + "] (to infer type being enriched) - this plugin will not be used.");
-      }
-   }
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   public static void removeAllEnricherPlugins()
-   {
-      enricherPlugins.clear();
-   }
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   private <T> void runPlugins(Class<T> c, T t, QInstance qInstance)
-   {
-      for(QInstanceEnricherPluginInterface<?> plugin : CollectionUtils.nonNullList(enricherPlugins.get(c)))
-      {
-         @SuppressWarnings("unchecked")
-         QInstanceEnricherPluginInterface<T> castedPlugin = (QInstanceEnricherPluginInterface<T>) plugin;
-         castedPlugin.enrich(t, qInstance);
       }
    }
 

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/instances/QInstanceHelpContentManager.java

@@ -30,6 +30,7 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import com.kingsrook.qqq.backend.core.actions.tables.QueryAction;
+import com.kingsrook.qqq.backend.core.context.QContext;
 import com.kingsrook.qqq.backend.core.logging.QLogger;
 import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryInput;
 import com.kingsrook.qqq.backend.core.model.actions.tables.query.QueryOutput;
@@ -110,7 +111,7 @@ public class QInstanceHelpContentManager
             }
             else
             {
-               LOG.info("Discarding help content with key-part that does not contain name:value format", logPair("key", key), logPair("part", part), logPair("id", record.getValue("id")));
+               LOG.info("Discarding help content with key that does not contain name:value format", logPair("key", key), logPair("id", record.getValue("id")));
             }
          }
 
@@ -149,19 +150,19 @@ public class QInstanceHelpContentManager
          ///////////////////////////////////////////////////////////////////////////////////
          if(StringUtils.hasContent(tableName))
          {
-            processHelpContentForTable(qInstance, key, tableName, sectionName, fieldName, slotName, roles, helpContent);
+            processHelpContentForTable(key, tableName, sectionName, fieldName, slotName, roles, helpContent);
          }
          else if(StringUtils.hasContent(processName))
          {
-            processHelpContentForProcess(qInstance, key, processName, fieldName, stepName, roles, helpContent);
+            processHelpContentForProcess(key, processName, fieldName, stepName, roles, helpContent);
          }
          else if(StringUtils.hasContent(widgetName))
          {
-            processHelpContentForWidget(qInstance, key, widgetName, slotName, roles, helpContent);
+            processHelpContentForWidget(key, widgetName, slotName, roles, helpContent);
          }
          else if(nameValuePairs.containsKey("instanceLevel"))
          {
-            processHelpContentForInstance(qInstance, key, slotName, roles, helpContent);
+            processHelpContentForInstance(key, slotName, roles, helpContent);
          }
       }
       catch(Exception e)
@@ -175,9 +176,9 @@ public class QInstanceHelpContentManager
    /*******************************************************************************
     **
     *******************************************************************************/
-   private static void processHelpContentForTable(QInstance qInstance, String key, String tableName, String sectionName, String fieldName, String slotName, Set<HelpRole> roles, QHelpContent helpContent)
+   private static void processHelpContentForTable(String key, String tableName, String sectionName, String fieldName, String slotName, Set<HelpRole> roles, QHelpContent helpContent)
    {
-      QTableMetaData table = qInstance.getTable(tableName);
+      QTableMetaData table = QContext.getQInstance().getTable(tableName);
       if(table == null)
       {
          LOG.info("Unrecognized table in help content", logPair("key", key));
@@ -245,30 +246,9 @@ public class QInstanceHelpContentManager
    /*******************************************************************************
     **
     *******************************************************************************/
-   private static void processHelpContentForProcess(QInstance qInstance, String key, String processName, String fieldName, String stepName, Set<HelpRole> roles, QHelpContent helpContent)
+   private static void processHelpContentForProcess(String key, String processName, String fieldName, String stepName, Set<HelpRole> roles, QHelpContent helpContent)
    {
-      if(processName.startsWith("*") && processName.length() > 1)
-      {
-         boolean anyMatched = false;
-         String subName = processName.substring(1);
-         for(QProcessMetaData process : qInstance.getProcesses().values())
-         {
-            if(process.getName().endsWith(subName))
-            {
-               anyMatched = true;
-               processHelpContentForProcess(qInstance, key, process.getName(), fieldName, stepName, roles, helpContent);
-            }
-         }
-
-         if(!anyMatched)
-         {
-            LOG.info("Wildcard process name did not match any processes in help content", logPair("key", key));
-         }
-
-         return;
-      }
-
-      QProcessMetaData process = qInstance.getProcess(processName);
+      QProcessMetaData process = QContext.getQInstance().getProcess(processName);
       if(process == null)
       {
          LOG.info("Unrecognized process in help content", logPair("key", key));
@@ -326,9 +306,9 @@ public class QInstanceHelpContentManager
    /*******************************************************************************
     **
     *******************************************************************************/
-   private static void processHelpContentForWidget(QInstance qInstance, String key, String widgetName, String slotName, Set<HelpRole> roles, QHelpContent helpContent)
+   private static void processHelpContentForWidget(String key, String widgetName, String slotName, Set<HelpRole> roles, QHelpContent helpContent)
    {
-      QWidgetMetaDataInterface widget = qInstance.getWidget(widgetName);
+      QWidgetMetaDataInterface widget = QContext.getQInstance().getWidget(widgetName);
       if(!StringUtils.hasContent(slotName))
       {
          LOG.info("Missing slot name in help content", logPair("key", key));
@@ -355,7 +335,7 @@ public class QInstanceHelpContentManager
    /*******************************************************************************
     **
     *******************************************************************************/
-   private static void processHelpContentForInstance(QInstance qInstance, String key, String slotName, Set<HelpRole> roles, QHelpContent helpContent)
+   private static void processHelpContentForInstance(String key, String slotName, Set<HelpRole> roles, QHelpContent helpContent)
    {
       if(!StringUtils.hasContent(slotName))
       {
@@ -365,11 +345,11 @@ public class QInstanceHelpContentManager
       {
          if(helpContent != null)
          {
-            qInstance.withHelpContent(slotName, helpContent);
+            QContext.getQInstance().withHelpContent(slotName, helpContent);
          }
          else
          {
-            qInstance.removeHelpContent(slotName, roles);
+            QContext.getQInstance().removeHelpContent(slotName, roles);
          }
       }
    }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/instances/QInstanceValidationState.java

@@ -1,34 +0,0 @@
-/*
- * QQQ - Low-code Application Framework for Engineers.
- * Copyright (C) 2021-2022.  Kingsrook, LLC
- * 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States
- * contact@kingsrook.com
- * https://github.com/Kingsrook/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.kingsrook.qqq.backend.core.instances;
-
-
-/*******************************************************************************
- ** Object used to record state of a QInstance having been validated.
- **
- *******************************************************************************/
-public enum QInstanceValidationState
-{
-   PENDING,
-   RUNNING,
-   COMPLETE
-}

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/instances/QInstanceValidator.java

@@ -37,17 +37,13 @@ import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.TimeZone;
-import java.util.function.Function;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 import java.util.stream.Stream;
 import com.kingsrook.qqq.backend.core.actions.automation.RecordAutomationHandler;
 import com.kingsrook.qqq.backend.core.actions.customizers.TableCustomizers;
 import com.kingsrook.qqq.backend.core.actions.dashboard.widgets.AbstractWidgetRenderer;
 import com.kingsrook.qqq.backend.core.actions.metadata.JoinGraph;
-import com.kingsrook.qqq.backend.core.actions.metadata.MetaDataFilterInterface;
 import com.kingsrook.qqq.backend.core.actions.processes.BackendStep;
-import com.kingsrook.qqq.backend.core.actions.reporting.customizers.ReportCustomRecordSourceInterface;
 import com.kingsrook.qqq.backend.core.actions.scripts.TestScriptActionInterface;
 import com.kingsrook.qqq.backend.core.actions.values.QCustomPossibleValueProvider;
 import com.kingsrook.qqq.backend.core.exceptions.QInstanceValidationException;
@@ -72,21 +68,17 @@ import com.kingsrook.qqq.backend.core.model.metadata.fields.FieldBehavior;
 import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.fields.ValueTooLongBehavior;
 import com.kingsrook.qqq.backend.core.model.metadata.joins.JoinOn;
-import com.kingsrook.qqq.backend.core.model.metadata.joins.JoinType;
 import com.kingsrook.qqq.backend.core.model.metadata.joins.QJoinMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.layout.QAppChildMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.layout.QAppMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.layout.QAppSection;
 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.processes.QBackendStepMetaData;
 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.model.metadata.processes.QSupplementalProcessMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.queues.QQueueMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.queues.QQueueProviderMetaData;
-import com.kingsrook.qqq.backend.core.model.metadata.queues.QueueType;
-import com.kingsrook.qqq.backend.core.model.metadata.queues.SQSQueueMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.queues.SQSQueueProviderMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.reporting.QReportDataSource;
 import com.kingsrook.qqq.backend.core.model.metadata.reporting.QReportField;
@@ -110,16 +102,12 @@ import com.kingsrook.qqq.backend.core.model.metadata.tables.automation.Automatio
 import com.kingsrook.qqq.backend.core.model.metadata.tables.automation.QTableAutomationDetails;
 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.model.metadata.variants.BackendVariantSetting;
-import com.kingsrook.qqq.backend.core.model.metadata.variants.BackendVariantsConfig;
 import com.kingsrook.qqq.backend.core.modules.authentication.QAuthenticationModuleCustomizerInterface;
 import com.kingsrook.qqq.backend.core.utils.CollectionUtils;
 import com.kingsrook.qqq.backend.core.utils.ListingHash;
 import com.kingsrook.qqq.backend.core.utils.StringUtils;
 import com.kingsrook.qqq.backend.core.utils.ValueUtils;
-import com.kingsrook.qqq.backend.core.utils.lambdas.UnsafeFunction;
 import com.kingsrook.qqq.backend.core.utils.lambdas.UnsafeLambda;
-import org.apache.commons.lang.BooleanUtils;
 import org.quartz.CronExpression;
 import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
 
@@ -151,20 +139,14 @@ public class QInstanceValidator
     *******************************************************************************/
    public void validate(QInstance qInstance) throws QInstanceValidationException
    {
-      if(qInstance.getHasBeenValidated() || qInstance.getValidationIsRunning())
+      if(qInstance.getHasBeenValidated())
       {
-         ///////////////////////////////////////////////////////////////////////////////////////////////////////////
-         // don't re-validate if previously complete or currently running (avoids recursive re-validation chaos!) //
-         ///////////////////////////////////////////////////////////////////////////////////////////////////////////
+         //////////////////////////////////////////
+         // don't re-validate if previously done //
+         //////////////////////////////////////////
          return;
       }
 
-      ////////////////////////////////////
-      // mark validation as running now //
-      ////////////////////////////////////
-      QInstanceValidationKey validationKey = new QInstanceValidationKey();
-      qInstance.setValidationIsRunning(validationKey);
-
       /////////////////////////////////////////////////////////////////////////////////////////////////////
       // the enricher will build a join graph (if there are any joins).  we'd like to only do that       //
       // once, during the enrichment/validation work, so, capture it, and store it back in the instance. //
@@ -194,7 +176,6 @@ public class QInstanceValidator
       //////////////////////////////////////////////////////////////////////////
       try
       {
-         validateInstanceAttributes(qInstance);
          validateBackends(qInstance);
          validateAuthentication(qInstance);
          validateAutomationProviders(qInstance);
@@ -226,24 +207,9 @@ public class QInstanceValidator
          throw (new QInstanceValidationException(errors));
       }
 
-      //////////////////////////////
-      // mark validation complete //
-      //////////////////////////////
-      qInstance.setJoinGraph(validationKey, joinGraph);
+      QInstanceValidationKey validationKey = new QInstanceValidationKey();
       qInstance.setHasBeenValidated(validationKey);
-   }
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   private void validateInstanceAttributes(QInstance qInstance)
-   {
-      if(qInstance.getMetaDataFilter() != null)
-      {
-         validateSimpleCodeReference("Instance metaDataFilter ", qInstance.getMetaDataFilter(), MetaDataFilterInterface.class);
-      }
+      qInstance.setJoinGraph(validationKey, joinGraph);
    }
 
 
@@ -379,8 +345,8 @@ public class QInstanceValidator
          assertCondition(join.getType() != null, "Missing type for join: " + joinName);
          assertCondition(CollectionUtils.nullSafeHasContents(join.getJoinOns()), "Missing joinOns for join: " + joinName);
 
-         boolean leftTableExists  = assertCondition(qInstance.getTable(join.getLeftTable()) != null, "Left-table name " + join.getLeftTable() + " in join " + joinName + " is not a defined table in this instance.");
-         boolean rightTableExists = assertCondition(qInstance.getTable(join.getRightTable()) != null, "Right-table name " + join.getRightTable() + " in join " + joinName + " is not a defined table in this instance.");
+         boolean leftTableExists  = assertCondition(qInstance.getTable(join.getLeftTable()) != null, "Left-table name " + join.getLeftTable() + " join " + joinName + " is not a defined table in this instance.");
+         boolean rightTableExists = assertCondition(qInstance.getTable(join.getRightTable()) != null, "Right-table name " + join.getRightTable() + " join " + joinName + " is not a defined table in this instance.");
 
          for(JoinOn joinOn : CollectionUtils.nonNullList(join.getJoinOns()))
          {
@@ -465,30 +431,11 @@ public class QInstanceValidator
 
             if(queueProvider instanceof SQSQueueProviderMetaData sqsQueueProvider)
             {
-               if(queueProvider.getType() != null)
-               {
-                  assertCondition(queueProvider.getType().equals(QueueType.SQS), "Inconsistent Type/class given for queueProvider: " + name + " (SQSQueueProviderMetaData is not allowed for type " + queueProvider.getType() + ")");
-               }
-
                assertCondition(StringUtils.hasContent(sqsQueueProvider.getAccessKey()), "Missing accessKey for SQSQueueProvider: " + name);
                assertCondition(StringUtils.hasContent(sqsQueueProvider.getSecretKey()), "Missing secretKey for SQSQueueProvider: " + name);
                assertCondition(StringUtils.hasContent(sqsQueueProvider.getBaseURL()), "Missing baseURL for SQSQueueProvider: " + name);
                assertCondition(StringUtils.hasContent(sqsQueueProvider.getRegion()), "Missing region for SQSQueueProvider: " + name);
             }
-            else if(queueProvider.getClass().equals(QQueueProviderMetaData.class))
-            {
-               /////////////////////////////////////////////////////////////////////
-               // this just means a subtype wasn't used, so, it should be allowed //
-               // (unless we had a case where a type required a subtype?)         //
-               /////////////////////////////////////////////////////////////////////
-            }
-            else
-            {
-               if(queueProvider.getType() != null)
-               {
-                  assertCondition(!queueProvider.getType().equals(QueueType.SQS), "Inconsistent Type/class given for queueProvider: " + name + " (" + queueProvider.getClass().getSimpleName() + " is not allowed for type " + queueProvider.getType() + ")");
-               }
-            }
 
             runPlugins(QQueueProviderMetaData.class, queueProvider, qInstance);
          });
@@ -499,27 +446,7 @@ public class QInstanceValidator
          qInstance.getQueues().forEach((name, queue) ->
          {
             assertCondition(Objects.equals(name, queue.getName()), "Inconsistent naming for queue: " + name + "/" + queue.getName() + ".");
-
-            QQueueProviderMetaData queueProvider = qInstance.getQueueProvider(queue.getProviderName());
-            if(assertCondition(queueProvider != null, "Unrecognized queue providerName for queue: " + name))
-            {
-               if(queue instanceof SQSQueueMetaData)
-               {
-                  assertCondition(queueProvider.getType().equals(QueueType.SQS), "Inconsistent class given for queueMetaData: " + name + " (SQSQueueMetaData is not allowed for queue provider of type " + queueProvider.getType() + ")");
-               }
-               else if(queue.getClass().equals(QQueueMetaData.class))
-               {
-                  ////////////////////////////////////////////////////////////////////
-                  // this just means a subtype wasn't used, so, it should be        //
-                  // allowed (unless we had a case where a type required a subtype? //
-                  ////////////////////////////////////////////////////////////////////
-               }
-               else
-               {
-                  assertCondition(!queueProvider.getType().equals(QueueType.SQS), "Inconsistent class given for queueProvider: " + name + " (" + queue.getClass().getSimpleName() + " is not allowed for type " + queueProvider.getType() + ")");
-               }
-            }
-
+            assertCondition(qInstance.getQueueProvider(queue.getProviderName()) != null, "Unrecognized queue providerName for queue: " + name);
             assertCondition(StringUtils.hasContent(queue.getQueueName()), "Missing queueName for queue: " + name);
             if(assertCondition(StringUtils.hasContent(queue.getProcessName()), "Missing processName for queue: " + name))
             {
@@ -549,60 +476,6 @@ public class QInstanceValidator
          {
             assertCondition(Objects.equals(backendName, backend.getName()), "Inconsistent naming for backend: " + backendName + "/" + backend.getName() + ".");
 
-            ///////////////////////
-            // validate variants //
-            ///////////////////////
-            BackendVariantsConfig backendVariantsConfig = backend.getBackendVariantsConfig();
-            if(BooleanUtils.isTrue(backend.getUsesVariants()))
-            {
-               if(assertCondition(backendVariantsConfig != null, "Missing backendVariantsConfig in backend [" + backendName + "] which is marked as usesVariants"))
-               {
-                  assertCondition(StringUtils.hasContent(backendVariantsConfig.getVariantTypeKey()), "Missing variantTypeKey in backendVariantsConfig in [" + backendName + "]");
-
-                  String         optionsTableName = backendVariantsConfig.getOptionsTableName();
-                  QTableMetaData optionsTable     = qInstance.getTable(optionsTableName);
-                  if(assertCondition(StringUtils.hasContent(optionsTableName), "Missing optionsTableName in backendVariantsConfig in [" + backendName + "]"))
-                  {
-                     if(assertCondition(optionsTable != null, "Unrecognized optionsTableName [" + optionsTableName + "] in backendVariantsConfig in [" + backendName + "]"))
-                     {
-                        QQueryFilter optionsFilter = backendVariantsConfig.getOptionsFilter();
-                        if(optionsFilter != null)
-                        {
-                           validateQueryFilter(qInstance, "optionsFilter in backendVariantsConfig in backend [" + backendName + "]: ", optionsTable, optionsFilter, null);
-                        }
-                     }
-                  }
-
-                  Map<BackendVariantSetting, String> backendSettingSourceFieldNameMap = backendVariantsConfig.getBackendSettingSourceFieldNameMap();
-                  if(assertCondition(CollectionUtils.nullSafeHasContents(backendSettingSourceFieldNameMap), "Missing or empty backendSettingSourceFieldNameMap in backendVariantsConfig in [" + backendName + "]"))
-                  {
-                     ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-                     // only validate field names in the backendSettingSourceFieldNameMap if there is NOT a variantRecordSupplier //
-                     // (the idea being, that the supplier might be building a record with fieldNames that aren't in the table... //
-                     ///////////////////////////////////////////////////////////////////////////////////////////////////////////////
-                     if(optionsTable != null && backendVariantsConfig.getVariantRecordLookupFunction() == null)
-                     {
-                        for(Map.Entry<BackendVariantSetting, String> entry : backendSettingSourceFieldNameMap.entrySet())
-                        {
-                           assertCondition(optionsTable.getFields().containsKey(entry.getValue()), "Unrecognized fieldName [" + entry.getValue() + "] in backendSettingSourceFieldNameMap in backendVariantsConfig in [" + backendName + "]");
-                        }
-                     }
-                  }
-
-                  if(backendVariantsConfig.getVariantRecordLookupFunction() != null)
-                  {
-                     validateSimpleCodeReference("VariantRecordSupplier in backendVariantsConfig in backend [" + backendName + "]: ", backendVariantsConfig.getVariantRecordLookupFunction(), UnsafeFunction.class, Function.class);
-                  }
-               }
-            }
-            else
-            {
-               assertCondition(backendVariantsConfig == null, "Should not have a backendVariantsConfig in backend [" + backendName + "] which is not marked as usesVariants");
-            }
-
-            ///////////////////////////////////////////
-            // let the backend do its own validation //
-            ///////////////////////////////////////////
             backend.performValidation(this);
 
             runPlugins(QBackendMetaData.class, backend, qInstance);
@@ -637,7 +510,7 @@ public class QInstanceValidator
    private void validateAuthentication(QInstance qInstance)
    {
       QAuthenticationMetaData authentication = qInstance.getAuthentication();
-      if(assertCondition(authentication != null, "Authentication MetaData must be defined."))
+      if(authentication != null)
       {
          if(authentication.getCustomizer() != null)
          {
@@ -840,38 +713,15 @@ public class QInstanceValidator
       {
          if(assertCondition(StringUtils.hasContent(association.getName()), "missing a name for an Association on table " + table.getName()))
          {
-            String  messageSuffix   = " for Association " + association.getName() + " on table " + table.getName();
-            boolean recognizedTable = false;
+            String messageSuffix = " for Association " + association.getName() + " on table " + table.getName();
             if(assertCondition(StringUtils.hasContent(association.getAssociatedTableName()), "missing associatedTableName" + messageSuffix))
             {
-               if(assertCondition(qInstance.getTable(association.getAssociatedTableName()) != null, "unrecognized associatedTableName " + association.getAssociatedTableName() + messageSuffix))
-               {
-                  recognizedTable = true;
-               }
+               assertCondition(qInstance.getTable(association.getAssociatedTableName()) != null, "unrecognized associatedTableName " + association.getAssociatedTableName() + messageSuffix);
             }
 
             if(assertCondition(StringUtils.hasContent(association.getJoinName()), "missing joinName" + messageSuffix))
             {
-               QJoinMetaData join = qInstance.getJoin(association.getJoinName());
-               if(assertCondition(join != null, "unrecognized joinName " + association.getJoinName() + messageSuffix))
-               {
-                  assert join != null; // covered by the assertCondition
-
-                  if(recognizedTable)
-                  {
-                     boolean isLeftToRight = join.getLeftTable().equals(table.getName()) && join.getRightTable().equals(association.getAssociatedTableName());
-                     boolean isRightToLeft = join.getRightTable().equals(table.getName()) && join.getLeftTable().equals(association.getAssociatedTableName());
-                     assertCondition(isLeftToRight || isRightToLeft, "join [" + association.getJoinName() + "] does not connect tables [" + table.getName() + "] and [" + association.getAssociatedTableName() + "]" + messageSuffix);
-                     if(isLeftToRight)
-                     {
-                        assertCondition(join.getType().equals(JoinType.ONE_TO_MANY) || join.getType().equals(JoinType.ONE_TO_ONE), "Join type does not have 'one' on this table's side side (left)" + messageSuffix);
-                     }
-                     else if(isRightToLeft)
-                     {
-                        assertCondition(join.getType().equals(JoinType.MANY_TO_ONE) || join.getType().equals(JoinType.ONE_TO_ONE), "Join type does not have 'one' on this table's side (right)" + messageSuffix);
-                     }
-                  }
-               }
+               assertCondition(qInstance.getJoin(association.getJoinName()) != null, "unrecognized joinName " + association.getJoinName() + messageSuffix);
             }
          }
       }
@@ -1023,13 +873,18 @@ public class QInstanceValidator
    /*******************************************************************************
     **
     *******************************************************************************/
-   private void validateTableField(QInstance qInstance, String tableName, String fieldName, QTableMetaData table, QFieldMetaData field)
+   private <T extends FieldBehavior<T>> void validateTableField(QInstance qInstance, String tableName, String fieldName, QTableMetaData table, QFieldMetaData field)
    {
       assertCondition(Objects.equals(fieldName, field.getName()),
          "Inconsistent naming in table " + tableName + " for field " + fieldName + "/" + field.getName() + ".");
 
+      if(field.getPossibleValueSourceName() != null)
+      {
+         assertCondition(qInstance.getPossibleValueSource(field.getPossibleValueSourceName()) != null,
+            "Unrecognized possibleValueSourceName " + field.getPossibleValueSourceName() + " in table " + tableName + " for field " + fieldName + ".");
+      }
+
       String prefix = "Field " + fieldName + " in table " + tableName + " ";
-      validateFieldPossibleValueSourceAttributes(qInstance, field, prefix);
 
       ///////////////////////////////////////////////////
       // validate things we know about field behaviors //
@@ -1040,23 +895,14 @@ public class QInstanceValidator
          assertCondition(field.getMaxLength() != null, prefix + "specifies a ValueTooLongBehavior, but not a maxLength.");
       }
 
-      Set<Class<FieldBehavior<?>>> usedFieldBehaviorTypes = new HashSet<>();
+      Set<Class<FieldBehavior<T>>> usedFieldBehaviorTypes = new HashSet<>();
       if(field.getBehaviors() != null)
       {
          for(FieldBehavior<?> fieldBehavior : field.getBehaviors())
          {
-            @SuppressWarnings("unchecked")
-            Class<FieldBehavior<?>> behaviorClass = (Class<FieldBehavior<?>>) fieldBehavior.getClass();
+            Class<FieldBehavior<T>> behaviorClass = (Class<FieldBehavior<T>>) fieldBehavior.getClass();
 
-            List<String> behaviorErrors = fieldBehavior.validateBehaviorConfiguration(table, field);
-            if(behaviorErrors != null)
-            {
-               String prefixMinusTrailingSpace = prefix.replaceFirst(" *$", "");
-               for(String behaviorError : behaviorErrors)
-               {
-                  errors.add(prefixMinusTrailingSpace + ": " + behaviorClass.getSimpleName() + ": " + behaviorError);
-               }
-            }
+            errors.addAll(fieldBehavior.validateBehaviorConfiguration(table, field));
 
             if(!fieldBehavior.allowMultipleBehaviorsOfThisType())
             {
@@ -1087,7 +933,7 @@ public class QInstanceValidator
          }
 
          assertCondition(fieldSecurityLock.getDefaultBehavior() != null, prefix + "has a fieldSecurityLock that is missing a defaultBehavior");
-         assertCondition(CollectionUtils.nullSafeHasContents(fieldSecurityLock.getOverrideValues()), prefix + "has a fieldSecurityLock that is missing overrideValues");
+         assertCondition(CollectionUtils.nullSafeHasContents(fieldSecurityLock.getKeyValueBehaviors()), prefix + "has a fieldSecurityLock that is missing keyValueBehaviors");
       }
 
       for(FieldAdornment adornment : CollectionUtils.nonNullList(field.getAdornments()))
@@ -1142,31 +988,6 @@ public class QInstanceValidator
 
 
 
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   private void validateFieldPossibleValueSourceAttributes(QInstance qInstance, QFieldMetaData field, String prefix)
-   {
-      if(field.getPossibleValueSourceName() != null)
-      {
-         assertCondition(qInstance.getPossibleValueSource(field.getPossibleValueSourceName()) != null,
-            prefix + "has an unrecognized possibleValueSourceName " + field.getPossibleValueSourceName());
-
-         assertCondition(field.getInlinePossibleValueSource() == null, prefix.trim() + " has both a possibleValueSourceName and an inlinePossibleValueSource, which is not allowed.");
-      }
-
-      if(field.getInlinePossibleValueSource() != null)
-      {
-         String name = "inlinePossibleValueSource for " + prefix.trim();
-         if(assertCondition(QPossibleValueSourceType.ENUM.equals(field.getInlinePossibleValueSource().getType()), name + " must have a type of ENUM."))
-         {
-            validatePossibleValueSource(qInstance, name, field.getInlinePossibleValueSource());
-         }
-      }
-   }
-
-
-
    /*******************************************************************************
     **
     *******************************************************************************/
@@ -1416,7 +1237,7 @@ public class QInstanceValidator
                ////////////////////////////////////////////////////////////////////////
                if(customizerInstance != null && tableCustomizer.getExpectedType() != null)
                {
-                  assertObjectCanBeCasted(prefix, customizerInstance, tableCustomizer.getExpectedType());
+                  assertObjectCanBeCasted(prefix, tableCustomizer.getExpectedType(), customizerInstance);
                }
             }
          }
@@ -1428,31 +1249,18 @@ public class QInstanceValidator
    /*******************************************************************************
     ** Make sure that a given object can be casted to an expected type.
     *******************************************************************************/
-   private void assertObjectCanBeCasted(String errorPrefix, Object object, Class<?>... anyOfExpectedClasses)
+   private <T> T assertObjectCanBeCasted(String errorPrefix, Class<T> expectedType, Object object)
    {
-      for(Class<?> expectedClass : anyOfExpectedClasses)
+      T castedObject = null;
+      try
       {
-         try
-         {
-            expectedClass.cast(object);
-            return;
-         }
-         catch(ClassCastException e)
-         {
-            /////////////////////////////////////
-            // try next type (if there is one) //
-            /////////////////////////////////////
-         }
+         castedObject = expectedType.cast(object);
       }
-
-      if(anyOfExpectedClasses.length == 1)
+      catch(ClassCastException e)
       {
-         errors.add(errorPrefix + "CodeReference is not of the expected type: " + anyOfExpectedClasses[0]);
-      }
-      else
-      {
-         errors.add(errorPrefix + "CodeReference is not any of the expected types: " + Arrays.stream(anyOfExpectedClasses).map(c -> c.getName()).collect(Collectors.joining(", ")));
+         errors.add(errorPrefix + "CodeReference is not of the expected type: " + expectedType);
       }
+      return castedObject;
    }
 
 
@@ -1687,16 +1495,6 @@ public class QInstanceValidator
                }
             }
 
-            for(QFieldMetaData field : process.getInputFields())
-            {
-               validateFieldPossibleValueSourceAttributes(qInstance, field, "Process " + processName + ", input field " + field.getName() + " ");
-            }
-
-            for(QFieldMetaData field : process.getOutputFields())
-            {
-               validateFieldPossibleValueSourceAttributes(qInstance, field, "Process " + processName + ", output field " + field.getName() + " ");
-            }
-
             if(process.getCancelStep() != null)
             {
                if(assertCondition(process.getCancelStep().getCode() != null, "Cancel step is missing a code reference, in process " + processName))
@@ -1812,12 +1610,9 @@ public class QInstanceValidator
 
                   String dataSourceErrorPrefix = "Report " + reportName + " data source " + dataSource.getName() + " ";
 
-                  boolean hasASource = false;
-
                   if(StringUtils.hasContent(dataSource.getSourceTable()))
                   {
-                     hasASource = true;
-                     assertCondition(dataSource.getStaticDataSupplier() == null, dataSourceErrorPrefix + "has both a sourceTable and a staticDataSupplier (not compatible together).");
+                     assertCondition(dataSource.getStaticDataSupplier() == null, dataSourceErrorPrefix + "has both a sourceTable and a staticDataSupplier (exactly 1 is required).");
                      if(assertCondition(qInstance.getTable(dataSource.getSourceTable()) != null, dataSourceErrorPrefix + "source table " + dataSource.getSourceTable() + " is not a table in this instance."))
                      {
                         if(dataSource.getQueryFilter() != null)
@@ -1826,21 +1621,14 @@ public class QInstanceValidator
                         }
                      }
                   }
-
-                  if(dataSource.getStaticDataSupplier() != null)
+                  else if(dataSource.getStaticDataSupplier() != null)
                   {
-                     assertCondition(dataSource.getCustomRecordSource() == null, dataSourceErrorPrefix + "has both a staticDataSupplier and a customRecordSource (not compatible together).");
-                     hasASource = true;
                      validateSimpleCodeReference(dataSourceErrorPrefix, dataSource.getStaticDataSupplier(), Supplier.class);
                   }
-
-                  if(dataSource.getCustomRecordSource() != null)
+                  else
                   {
-                     hasASource = true;
-                     validateSimpleCodeReference(dataSourceErrorPrefix, dataSource.getCustomRecordSource(), ReportCustomRecordSourceInterface.class);
+                     errors.add(dataSourceErrorPrefix + "does not have a sourceTable or a staticDataSupplier (exactly 1 is required).");
                   }
-
-                  assertCondition(hasASource, dataSourceErrorPrefix + "does not have a sourceTable, customRecordSource, or a staticDataSupplier.");
                }
             }
 
@@ -2081,11 +1869,6 @@ public class QInstanceValidator
                   }
                }
 
-               if(widget.getValidatorPlugin() != null)
-               {
-                  widget.getValidatorPlugin().validate(widget, qInstance, this);
-               }
-
                runPlugins(QWidgetMetaDataInterface.class, widget, qInstance);
             }
          );
@@ -2104,100 +1887,87 @@ public class QInstanceValidator
          qInstance.getPossibleValueSources().forEach((pvsName, possibleValueSource) ->
          {
             assertCondition(Objects.equals(pvsName, possibleValueSource.getName()), "Inconsistent naming for possibleValueSource: " + pvsName + "/" + possibleValueSource.getName() + ".");
-            validatePossibleValueSource(qInstance, pvsName, possibleValueSource);
+            if(assertCondition(possibleValueSource.getType() != null, "Missing type for possibleValueSource: " + pvsName))
+            {
+               ////////////////////////////////////////////////////////////////////////////////////////////////
+               // assert about fields that should and should not be set, based on possible value source type //
+               // do additional type-specific validations as well                                            //
+               ////////////////////////////////////////////////////////////////////////////////////////////////
+               switch(possibleValueSource.getType())
+               {
+                  case ENUM ->
+                  {
+                     assertCondition(!StringUtils.hasContent(possibleValueSource.getTableName()), "enum-type possibleValueSource " + pvsName + " should not have a tableName.");
+                     assertCondition(!CollectionUtils.nullSafeHasContents(possibleValueSource.getSearchFields()), "enum-type possibleValueSource " + pvsName + " should not have searchFields.");
+                     assertCondition(!CollectionUtils.nullSafeHasContents(possibleValueSource.getOrderByFields()), "enum-type possibleValueSource " + pvsName + " should not have orderByFields.");
+                     assertCondition(possibleValueSource.getCustomCodeReference() == null, "enum-type possibleValueSource " + pvsName + " should not have a customCodeReference.");
+
+                     assertCondition(CollectionUtils.nullSafeHasContents(possibleValueSource.getEnumValues()), "enum-type possibleValueSource " + pvsName + " is missing enum values");
+                  }
+                  case TABLE ->
+                  {
+                     assertCondition(CollectionUtils.nullSafeIsEmpty(possibleValueSource.getEnumValues()), "table-type possibleValueSource " + pvsName + " should not have enum values.");
+                     assertCondition(possibleValueSource.getCustomCodeReference() == null, "table-type possibleValueSource " + pvsName + " should not have a customCodeReference.");
+
+                     QTableMetaData tableMetaData = null;
+                     if(assertCondition(StringUtils.hasContent(possibleValueSource.getTableName()), "table-type possibleValueSource " + pvsName + " is missing a tableName."))
+                     {
+                        tableMetaData = qInstance.getTable(possibleValueSource.getTableName());
+                        assertCondition(tableMetaData != null, "Unrecognized table " + possibleValueSource.getTableName() + " for possibleValueSource " + pvsName + ".");
+                     }
+
+                     if(assertCondition(CollectionUtils.nullSafeHasContents(possibleValueSource.getSearchFields()), "table-type possibleValueSource " + pvsName + " is missing searchFields."))
+                     {
+                        if(tableMetaData != null)
+                        {
+                           QTableMetaData finalTableMetaData = tableMetaData;
+                           for(String searchField : possibleValueSource.getSearchFields())
+                           {
+                              assertNoException(() -> finalTableMetaData.getField(searchField), "possibleValueSource " + pvsName + " has an unrecognized searchField: " + searchField);
+                           }
+                        }
+                     }
+
+                     if(assertCondition(CollectionUtils.nullSafeHasContents(possibleValueSource.getOrderByFields()), "table-type possibleValueSource " + pvsName + " is missing orderByFields."))
+                     {
+                        if(tableMetaData != null)
+                        {
+                           QTableMetaData finalTableMetaData = tableMetaData;
+
+                           for(QFilterOrderBy orderByField : possibleValueSource.getOrderByFields())
+                           {
+                              assertNoException(() -> finalTableMetaData.getField(orderByField.getFieldName()), "possibleValueSource " + pvsName + " has an unrecognized orderByField: " + orderByField.getFieldName());
+                           }
+                        }
+                     }
+                  }
+                  case CUSTOM ->
+                  {
+                     assertCondition(CollectionUtils.nullSafeIsEmpty(possibleValueSource.getEnumValues()), "custom-type possibleValueSource " + pvsName + " should not have enum values.");
+                     assertCondition(!StringUtils.hasContent(possibleValueSource.getTableName()), "custom-type possibleValueSource " + pvsName + " should not have a tableName.");
+                     assertCondition(!CollectionUtils.nullSafeHasContents(possibleValueSource.getSearchFields()), "custom-type possibleValueSource " + pvsName + " should not have searchFields.");
+                     assertCondition(!CollectionUtils.nullSafeHasContents(possibleValueSource.getOrderByFields()), "custom-type possibleValueSource " + pvsName + " should not have orderByFields.");
+
+                     if(assertCondition(possibleValueSource.getCustomCodeReference() != null, "custom-type possibleValueSource " + pvsName + " is missing a customCodeReference."))
+                     {
+                        validateSimpleCodeReference("PossibleValueSource " + pvsName + " custom code reference: ", possibleValueSource.getCustomCodeReference(), QCustomPossibleValueProvider.class);
+                     }
+                  }
+                  default -> errors.add("Unexpected possibleValueSource type: " + possibleValueSource.getType());
+               }
+
+               runPlugins(QPossibleValueSource.class, possibleValueSource, qInstance);
+            }
          });
       }
    }
 
 
 
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   private void validatePossibleValueSource(QInstance qInstance, String name, QPossibleValueSource possibleValueSource)
-   {
-      if(assertCondition(possibleValueSource.getType() != null, "Missing type for possibleValueSource: " + name))
-      {
-         ////////////////////////////////////////////////////////////////////////////////////////////////
-         // assert about fields that should and should not be set, based on possible value source type //
-         // do additional type-specific validations as well                                            //
-         ////////////////////////////////////////////////////////////////////////////////////////////////
-         switch(possibleValueSource.getType())
-         {
-            case ENUM ->
-            {
-               assertCondition(!StringUtils.hasContent(possibleValueSource.getTableName()), "enum-type possibleValueSource " + name + " should not have a tableName.");
-               assertCondition(!CollectionUtils.nullSafeHasContents(possibleValueSource.getSearchFields()), "enum-type possibleValueSource " + name + " should not have searchFields.");
-               assertCondition(!CollectionUtils.nullSafeHasContents(possibleValueSource.getOrderByFields()), "enum-type possibleValueSource " + name + " should not have orderByFields.");
-               assertCondition(possibleValueSource.getCustomCodeReference() == null, "enum-type possibleValueSource " + name + " should not have a customCodeReference.");
-
-               assertCondition(CollectionUtils.nullSafeHasContents(possibleValueSource.getEnumValues()), "enum-type possibleValueSource " + name + " is missing enum values");
-            }
-            case TABLE ->
-            {
-               assertCondition(CollectionUtils.nullSafeIsEmpty(possibleValueSource.getEnumValues()), "table-type possibleValueSource " + name + " should not have enum values.");
-               assertCondition(possibleValueSource.getCustomCodeReference() == null, "table-type possibleValueSource " + name + " should not have a customCodeReference.");
-
-               QTableMetaData tableMetaData = null;
-               if(assertCondition(StringUtils.hasContent(possibleValueSource.getTableName()), "table-type possibleValueSource " + name + " is missing a tableName."))
-               {
-                  tableMetaData = qInstance.getTable(possibleValueSource.getTableName());
-                  assertCondition(tableMetaData != null, "Unrecognized table " + possibleValueSource.getTableName() + " for possibleValueSource " + name + ".");
-               }
-
-               if(assertCondition(CollectionUtils.nullSafeHasContents(possibleValueSource.getSearchFields()), "table-type possibleValueSource " + name + " is missing searchFields."))
-               {
-                  if(tableMetaData != null)
-                  {
-                     QTableMetaData finalTableMetaData = tableMetaData;
-                     for(String searchField : possibleValueSource.getSearchFields())
-                     {
-                        assertNoException(() -> finalTableMetaData.getField(searchField), "possibleValueSource " + name + " has an unrecognized searchField: " + searchField);
-                     }
-                  }
-               }
-
-               if(assertCondition(CollectionUtils.nullSafeHasContents(possibleValueSource.getOrderByFields()), "table-type possibleValueSource " + name + " is missing orderByFields."))
-               {
-                  if(tableMetaData != null)
-                  {
-                     QTableMetaData finalTableMetaData = tableMetaData;
-
-                     for(QFilterOrderBy orderByField : possibleValueSource.getOrderByFields())
-                     {
-                        assertNoException(() -> finalTableMetaData.getField(orderByField.getFieldName()), "possibleValueSource " + name + " has an unrecognized orderByField: " + orderByField.getFieldName());
-                     }
-                  }
-               }
-            }
-            case CUSTOM ->
-            {
-               assertCondition(CollectionUtils.nullSafeIsEmpty(possibleValueSource.getEnumValues()), "custom-type possibleValueSource " + name + " should not have enum values.");
-               assertCondition(!StringUtils.hasContent(possibleValueSource.getTableName()), "custom-type possibleValueSource " + name + " should not have a tableName.");
-               assertCondition(!CollectionUtils.nullSafeHasContents(possibleValueSource.getSearchFields()), "custom-type possibleValueSource " + name + " should not have searchFields.");
-               assertCondition(!CollectionUtils.nullSafeHasContents(possibleValueSource.getOrderByFields()), "custom-type possibleValueSource " + name + " should not have orderByFields.");
-
-               if(assertCondition(possibleValueSource.getCustomCodeReference() != null, "custom-type possibleValueSource " + name + " is missing a customCodeReference."))
-               {
-                  validateSimpleCodeReference("PossibleValueSource " + name + " custom code reference: ", possibleValueSource.getCustomCodeReference(), QCustomPossibleValueProvider.class);
-               }
-            }
-            default -> errors.add("Unexpected possibleValueSource type: " + possibleValueSource.getType());
-         }
-
-         assertCondition(possibleValueSource.getIdType() != null, "possibleValueSource " + name + " is missing its idType.");
-
-         runPlugins(QPossibleValueSource.class, possibleValueSource, qInstance);
-      }
-   }
-
-
-
    /*******************************************************************************
     **
     *******************************************************************************/
-   @SafeVarargs
-   private void validateSimpleCodeReference(String prefix, QCodeReference codeReference, Class<?>... anyOfExpectedClasses)
+   private void validateSimpleCodeReference(String prefix, QCodeReference codeReference, Class<?> expectedClass)
    {
       if(!preAssertionsForCodeReference(codeReference, prefix))
       {
@@ -2225,7 +1995,7 @@ public class QInstanceValidator
             ////////////////////////////////////////////////////////////////////////
             if(classInstance != null)
             {
-               assertObjectCanBeCasted(prefix, classInstance, anyOfExpectedClasses);
+               assertObjectCanBeCasted(prefix, expectedClass, classInstance);
             }
          }
       }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/instances/SecretsManagerUtils.java

@@ -24,7 +24,6 @@ package com.kingsrook.qqq.backend.core.instances;
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.util.Objects;
 import java.util.Optional;
 import com.amazonaws.auth.AWSStaticCredentialsProvider;
@@ -114,7 +113,7 @@ public class SecretsManagerUtils
             dotEnv.renameTo(new File(".env.backup-" + System.currentTimeMillis()));
          }
 
-         FileUtils.writeStringToFile(dotEnv, fullEnv.toString(), StandardCharsets.UTF_8);
+         FileUtils.writeStringToFile(dotEnv, fullEnv.toString());
       }
       else
       {

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/instances/enrichment/plugins/QInstanceEnricherPluginInterface.java

@@ -1,40 +0,0 @@
-/*
- * QQQ - Low-code Application Framework for Engineers.
- * Copyright (C) 2021-2025.  Kingsrook, LLC
- * 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States
- * contact@kingsrook.com
- * https://github.com/Kingsrook/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.kingsrook.qqq.backend.core.instances.enrichment.plugins;
-
-
-import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
-
-
-/*******************************************************************************
- ** Interface for additional / optional enrichment to be done on q instance members.
- ** Some may be provided by QQQ - others can be defined by applications.
- *******************************************************************************/
-public interface QInstanceEnricherPluginInterface<T>
-{
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   void enrich(T object, QInstance qInstance);
-
-}

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/logging/QLogger.java

@@ -280,16 +280,6 @@ public class QLogger
 
 
 
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   public void debug(LogPair... logPairs)
-   {
-      logger.warn(() -> makeJsonString(null, null, logPairs));
-   }
-
-
-
    /*******************************************************************************
     **
     *******************************************************************************/
@@ -430,16 +420,6 @@ public class QLogger
 
 
 
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   public void warn(LogPair... logPairs)
-   {
-      logger.warn(() -> makeJsonString(null, null, logPairs));
-   }
-
-
-
    /*******************************************************************************
     **
     *******************************************************************************/
@@ -500,16 +480,6 @@ public class QLogger
 
 
 
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   public void error(LogPair... logPairs)
-   {
-      logger.warn(() -> makeJsonString(null, null, logPairs));
-   }
-
-
-
    /*******************************************************************************
     **
     *******************************************************************************/

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/MetaDataProducerInterface.java

@@ -1,6 +1,6 @@
 /*
  * QQQ - Low-code Application Framework for Engineers.
- * Copyright (C) 2021-2024.  Kingsrook, LLC
+ * Copyright (C) 2021-2023.  Kingsrook, LLC
  * 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States
  * contact@kingsrook.com
  * https://github.com/Kingsrook/
@@ -19,20 +19,22 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.kingsrook.qqq.backend.core.model.metadata;
+package com.kingsrook.qqq.backend.core.model;
 
 
 import com.kingsrook.qqq.backend.core.exceptions.QException;
+import com.kingsrook.qqq.backend.core.model.metadata.MetaDataProducerOutput;
+import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
 
 
 /*******************************************************************************
  ** Interface for classes that know how to produce meta data objects.  Useful with
- ** MetaDataProducerHelper, to point at a package full of these, and populate
+ ** MetaDataProducerHelper, to put point at a package full of these, and populate
  ** your whole QInstance.
  **
  ** See also MetaDataProducer - an implementer of this interface, which actually
  ** came first, and is fine to extend if producing a meta-data class is all your
- ** class means to do (nice and "Single-responsibility principle").
+ ** clas means to do (nice and "Single-responsibility principle").
  **
  ** But, in some applications you may want to, for example, have one class that
  ** defines a process step, and also produces the meta-data for that process, so

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/AbstractActionInput.java

@@ -32,6 +32,7 @@ import com.kingsrook.qqq.backend.core.exceptions.QInstanceValidationException;
 import com.kingsrook.qqq.backend.core.instances.QInstanceValidator;
 import com.kingsrook.qqq.backend.core.logging.QLogger;
 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;
 
 
@@ -93,12 +94,21 @@ public class AbstractActionInput
 
 
    /*******************************************************************************
-    ** Getter for instance
     **
-    ** Deprecated.  Please use QContext.getInstance() instead
     *******************************************************************************/
    @JsonIgnore
-   @Deprecated
+   public QAuthenticationMetaData getAuthenticationMetaData()
+   {
+      return (getInstance().getAuthentication());
+   }
+
+
+
+   /*******************************************************************************
+    ** Getter for instance
+    **
+    *******************************************************************************/
+   @JsonIgnore
    public QInstance getInstance()
    {
       return (QContext.getQInstance());
@@ -109,10 +119,8 @@ public class AbstractActionInput
    /*******************************************************************************
     ** Getter for session
     **
-    ** Deprecated.  Please use QContext.getSession() instead
     *******************************************************************************/
    @JsonIgnore
-   @Deprecated
    public QSession getSession()
    {
       return (QContext.getQSession());

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/audits/AuditDetailAccumulator.java

@@ -152,8 +152,5 @@ public class AuditDetailAccumulator implements Serializable
    }
 
 
-   /***************************************************************************
-    **
-    ***************************************************************************/
    private record TableNameAndPrimaryKey(String tableName, Serializable primaryKey) {}
 }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/audits/AuditSingleInput.java

@@ -326,20 +326,6 @@ public class AuditSingleInput implements Serializable
 
 
 
-   /*******************************************************************************
-    ** Fluent setter for details
-    *******************************************************************************/
-   public AuditSingleInput withDetailMessages(List<String> details)
-   {
-      for(String detail : details)
-      {
-         addDetail(message);
-      }
-      return (this);
-   }
-
-
-
    /*******************************************************************************
     **
     *******************************************************************************/

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/metadata/MetaDataInput.java

@@ -31,16 +31,6 @@ import com.kingsrook.qqq.backend.core.model.actions.AbstractActionInput;
  *******************************************************************************/
 public class MetaDataInput extends AbstractActionInput
 {
-   private String frontendName;
-   private String frontendVersion;
-
-   private String middlewareName;
-   private String middlewareVersion;
-
-   private String applicationName;
-   private String applicationVersion;
-
-
 
    /*******************************************************************************
     **
@@ -49,190 +39,4 @@ public class MetaDataInput extends AbstractActionInput
    {
    }
 
-
-
-   /*******************************************************************************
-    ** Getter for frontendName
-    *******************************************************************************/
-   public String getFrontendName()
-   {
-      return (this.frontendName);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for frontendName
-    *******************************************************************************/
-   public void setFrontendName(String frontendName)
-   {
-      this.frontendName = frontendName;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for frontendName
-    *******************************************************************************/
-   public MetaDataInput withFrontendName(String frontendName)
-   {
-      this.frontendName = frontendName;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for frontendVersion
-    *******************************************************************************/
-   public String getFrontendVersion()
-   {
-      return (this.frontendVersion);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for frontendVersion
-    *******************************************************************************/
-   public void setFrontendVersion(String frontendVersion)
-   {
-      this.frontendVersion = frontendVersion;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for frontendVersion
-    *******************************************************************************/
-   public MetaDataInput withFrontendVersion(String frontendVersion)
-   {
-      this.frontendVersion = frontendVersion;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for middlewareName
-    *******************************************************************************/
-   public String getMiddlewareName()
-   {
-      return (this.middlewareName);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for middlewareName
-    *******************************************************************************/
-   public void setMiddlewareName(String middlewareName)
-   {
-      this.middlewareName = middlewareName;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for middlewareName
-    *******************************************************************************/
-   public MetaDataInput withMiddlewareName(String middlewareName)
-   {
-      this.middlewareName = middlewareName;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for middlewareVersion
-    *******************************************************************************/
-   public String getMiddlewareVersion()
-   {
-      return (this.middlewareVersion);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for middlewareVersion
-    *******************************************************************************/
-   public void setMiddlewareVersion(String middlewareVersion)
-   {
-      this.middlewareVersion = middlewareVersion;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for middlewareVersion
-    *******************************************************************************/
-   public MetaDataInput withMiddlewareVersion(String middlewareVersion)
-   {
-      this.middlewareVersion = middlewareVersion;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for applicationName
-    *******************************************************************************/
-   public String getApplicationName()
-   {
-      return (this.applicationName);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for applicationName
-    *******************************************************************************/
-   public void setApplicationName(String applicationName)
-   {
-      this.applicationName = applicationName;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for applicationName
-    *******************************************************************************/
-   public MetaDataInput withApplicationName(String applicationName)
-   {
-      this.applicationName = applicationName;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for applicationVersion
-    *******************************************************************************/
-   public String getApplicationVersion()
-   {
-      return (this.applicationVersion);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for applicationVersion
-    *******************************************************************************/
-   public void setApplicationVersion(String applicationVersion)
-   {
-      this.applicationVersion = applicationVersion;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for applicationVersion
-    *******************************************************************************/
-   public MetaDataInput withApplicationVersion(String applicationVersion)
-   {
-      this.applicationVersion = applicationVersion;
-      return (this);
-   }
-
 }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/processes/ProcessMetaDataAdjustment.java

@@ -1,139 +0,0 @@
-/*
- * QQQ - Low-code Application Framework for Engineers.
- * Copyright (C) 2021-2024.  Kingsrook, LLC
- * 651 N Broad St Ste 205 # 6917 | Middletown DE 19709 | United States
- * contact@kingsrook.com
- * https://github.com/Kingsrook/
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.kingsrook.qqq.backend.core.model.actions.processes;
-
-
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import com.kingsrook.qqq.backend.core.logging.QLogger;
-import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData;
-import com.kingsrook.qqq.backend.core.model.metadata.processes.QFrontendStepMetaData;
-import com.kingsrook.qqq.backend.core.utils.StringUtils;
-import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
-
-
-/*******************************************************************************
- ** Object that stores adjustments that a process wants to make, at run-time,
- ** to its meta-data.
- **
- ** e.g., changing the steps; updating fields (e.g., changing an inline PVS,
- ** or an isRequired attribute)
- *******************************************************************************/
-public class ProcessMetaDataAdjustment
-{
-   private static final QLogger LOG = QLogger.getLogger(ProcessMetaDataAdjustment.class);
-
-   private List<QFrontendStepMetaData> updatedFrontendStepList = null;
-   private Map<String, QFieldMetaData> updatedFields           = null;
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   public ProcessMetaDataAdjustment withUpdatedField(QFieldMetaData field)
-   {
-      if(updatedFields == null)
-      {
-         updatedFields = new LinkedHashMap<>();
-      }
-
-      if(!StringUtils.hasContent(field.getName()))
-      {
-         LOG.warn("Missing name on field in withUpdatedField - no update will happen.");
-      }
-      else
-      {
-         if(updatedFields.containsKey(field.getName()))
-         {
-            LOG.info("UpdatedFields map already contained a field with this name - overwriting it.", logPair("fieldName", field.getName()));
-         }
-
-         updatedFields.put(field.getName(), field);
-      }
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for updatedFrontendStepList
-    *******************************************************************************/
-   public List<QFrontendStepMetaData> getUpdatedFrontendStepList()
-   {
-      return (this.updatedFrontendStepList);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for updatedFrontendStepList
-    *******************************************************************************/
-   public void setUpdatedFrontendStepList(List<QFrontendStepMetaData> updatedFrontendStepList)
-   {
-      this.updatedFrontendStepList = updatedFrontendStepList;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for updatedFrontendStepList
-    *******************************************************************************/
-   public ProcessMetaDataAdjustment withUpdatedFrontendStepList(List<QFrontendStepMetaData> updatedFrontendStepList)
-   {
-      this.updatedFrontendStepList = updatedFrontendStepList;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for updatedFields
-    *******************************************************************************/
-   public Map<String, QFieldMetaData> getUpdatedFields()
-   {
-      return (this.updatedFields);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for updatedFields
-    *******************************************************************************/
-   public void setUpdatedFields(Map<String, QFieldMetaData> updatedFields)
-   {
-      this.updatedFields = updatedFields;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for updatedFields
-    *******************************************************************************/
-   public ProcessMetaDataAdjustment withUpdatedFields(Map<String, QFieldMetaData> updatedFields)
-   {
-      this.updatedFields = updatedFields;
-      return (this);
-   }
-
-}

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/processes/ProcessState.java

@@ -29,6 +29,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import com.kingsrook.qqq.backend.core.model.data.QRecord;
+import com.kingsrook.qqq.backend.core.model.metadata.processes.QFrontendStepMetaData;
 
 
 /*******************************************************************************
@@ -40,10 +41,11 @@ public class ProcessState implements Serializable
    private Map<String, Serializable> values       = new HashMap<>();
    private List<String>              stepList     = new ArrayList<>();
    private Optional<String>          nextStepName = Optional.empty();
-   private Optional<String>          backStepName = Optional.empty();
-   private boolean                   isStepBack   = false;
 
-   private ProcessMetaDataAdjustment processMetaDataAdjustment = null;
+   /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+   // maybe, remove this altogether - just let the frontend compute & send if needed... but how does it know last version...? //
+   /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+   private List<QFrontendStepMetaData> updatedFrontendStepList = null;
 
 
 
@@ -124,39 +126,6 @@ public class ProcessState implements Serializable
 
 
 
-   /*******************************************************************************
-    ** Getter for backStepName
-    **
-    *******************************************************************************/
-   public Optional<String> getBackStepName()
-   {
-      return backStepName;
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for backStepName
-    **
-    *******************************************************************************/
-   public void setBackStepName(String backStepName)
-   {
-      this.backStepName = Optional.of(backStepName);
-   }
-
-
-
-   /*******************************************************************************
-    ** clear out the value of backStepName (set the Optional to empty)
-    **
-    *******************************************************************************/
-   public void clearBackStepName()
-   {
-      this.backStepName = Optional.empty();
-   }
-
-
-
    /*******************************************************************************
     ** Getter for stepList
     **
@@ -179,67 +148,33 @@ public class ProcessState implements Serializable
 
 
 
-
-
    /*******************************************************************************
-    ** Getter for processMetaDataAdjustment
+    ** Getter for updatedFrontendStepList
     *******************************************************************************/
-   public ProcessMetaDataAdjustment getProcessMetaDataAdjustment()
+   public List<QFrontendStepMetaData> getUpdatedFrontendStepList()
    {
-      return (this.processMetaDataAdjustment);
+      return (this.updatedFrontendStepList);
    }
 
 
 
    /*******************************************************************************
-    ** Setter for processMetaDataAdjustment
+    ** Setter for updatedFrontendStepList
     *******************************************************************************/
-   public void setProcessMetaDataAdjustment(ProcessMetaDataAdjustment processMetaDataAdjustment)
+   public void setUpdatedFrontendStepList(List<QFrontendStepMetaData> updatedFrontendStepList)
    {
-      this.processMetaDataAdjustment = processMetaDataAdjustment;
+      this.updatedFrontendStepList = updatedFrontendStepList;
    }
 
 
 
    /*******************************************************************************
-    ** Fluent setter for processMetaDataAdjustment
+    ** Fluent setter for updatedFrontendStepList
     *******************************************************************************/
-   public ProcessState withProcessMetaDataAdjustment(ProcessMetaDataAdjustment processMetaDataAdjustment)
+   public ProcessState withUpdatedFrontendStepList(List<QFrontendStepMetaData> updatedFrontendStepList)
    {
-      this.processMetaDataAdjustment = processMetaDataAdjustment;
+      this.updatedFrontendStepList = updatedFrontendStepList;
       return (this);
    }
 
-
-
-   /*******************************************************************************
-    ** Getter for isStepBack
-    *******************************************************************************/
-   public boolean getIsStepBack()
-   {
-      return (this.isStepBack);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for isStepBack
-    *******************************************************************************/
-   public void setIsStepBack(boolean isStepBack)
-   {
-      this.isStepBack = isStepBack;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for isStepBack
-    *******************************************************************************/
-   public ProcessState withIsStepBack(boolean isStepBack)
-   {
-      this.isStepBack = isStepBack;
-      return (this);
-   }
-
-
 }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/processes/ProcessSummaryLine.java

@@ -53,7 +53,6 @@ public class ProcessSummaryLine implements ProcessSummaryLineInterface
    //////////////////////////////////////////////////////////////////////////
    private ArrayList<Serializable> primaryKeys;
 
-   private ArrayList<String> bulletsOfText;
 
 
    /*******************************************************************************
@@ -498,35 +497,4 @@ public class ProcessSummaryLine implements ProcessSummaryLineInterface
       return (this);
    }
 
-
-   /*******************************************************************************
-    ** Getter for bulletsOfText
-    *******************************************************************************/
-   public ArrayList<String> getBulletsOfText()
-   {
-      return (this.bulletsOfText);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for bulletsOfText
-    *******************************************************************************/
-   public void setBulletsOfText(ArrayList<String> bulletsOfText)
-   {
-      this.bulletsOfText = bulletsOfText;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for bulletsOfText
-    *******************************************************************************/
-   public ProcessSummaryLine withBulletsOfText(ArrayList<String> bulletsOfText)
-   {
-      this.bulletsOfText = bulletsOfText;
-      return (this);
-   }
-
-
 }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/processes/RunBackendStepInput.java

@@ -25,27 +25,19 @@ package com.kingsrook.qqq.backend.core.model.actions.processes;
 import java.io.Serializable;
 import java.time.Instant;
 import java.time.LocalDate;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.UUID;
 import com.kingsrook.qqq.backend.core.actions.async.AsyncJobCallback;
 import com.kingsrook.qqq.backend.core.actions.async.AsyncJobStatus;
 import com.kingsrook.qqq.backend.core.actions.async.NonPersistedAsyncJobCallback;
 import com.kingsrook.qqq.backend.core.actions.processes.QProcessCallback;
 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.AbstractActionInput;
 import com.kingsrook.qqq.backend.core.model.data.QRecord;
-import com.kingsrook.qqq.backend.core.model.data.QRecordEntity;
 import com.kingsrook.qqq.backend.core.model.metadata.processes.QStepMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
-import com.kingsrook.qqq.backend.core.processes.tracing.ProcessTracerInterface;
-import com.kingsrook.qqq.backend.core.processes.tracing.ProcessTracerMessage;
 import com.kingsrook.qqq.backend.core.utils.ValueUtils;
-import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
 
 
 /*******************************************************************************
@@ -54,8 +46,6 @@ import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
  *******************************************************************************/
 public class RunBackendStepInput extends AbstractActionInput
 {
-   private static final QLogger LOG = QLogger.getLogger(RunBackendStepInput.class);
-
    private ProcessState                         processState;
    private String                               processName;
    private String                               tableName;
@@ -65,13 +55,12 @@ public class RunBackendStepInput extends AbstractActionInput
    private RunProcessInput.FrontendStepBehavior frontendStepBehavior;
    private Instant                              basepullLastRunTime;
 
-   private ProcessTracerInterface processTracer;
-
    ////////////////////////////////////////////////////////////////////////////
    // note - new fields should generally be added in method: cloneFieldsInto //
    ////////////////////////////////////////////////////////////////////////////
 
 
+
    /*******************************************************************************
     **
     *******************************************************************************/
@@ -107,7 +96,6 @@ public class RunBackendStepInput extends AbstractActionInput
       target.setAsyncJobCallback(getAsyncJobCallback());
       target.setFrontendStepBehavior(getFrontendStepBehavior());
       target.setValues(getValues());
-      target.setProcessTracer(getProcessTracer().orElse(null));
    }
 
 
@@ -250,26 +238,6 @@ public class RunBackendStepInput extends AbstractActionInput
 
 
 
-   /*******************************************************************************
-    ** Getter for records converted to entities of a given type.
-    **
-    *******************************************************************************/
-   public <E extends QRecordEntity> List<E> getRecordsAsEntities(Class<E> entityClass) throws QException
-   {
-      List<E> rs = new ArrayList<>();
-
-      ///////////////////////////////////////////////////////////////////////////////////
-      // note - important to call getRecords here, which is overwritten in subclasses! //
-      ///////////////////////////////////////////////////////////////////////////////////
-      for(QRecord record : getRecords())
-      {
-         rs.add(QRecordEntity.fromQRecord(entityClass, record));
-      }
-      return (rs);
-   }
-
-
-
    /*******************************************************************************
     ** Setter for records
     **
@@ -451,17 +419,6 @@ public class RunBackendStepInput extends AbstractActionInput
 
 
 
-   /*******************************************************************************
-    ** Accessor for processState's isStepBack attribute
-    **
-    *******************************************************************************/
-   public boolean getIsStepBack()
-   {
-      return processState.getIsStepBack();
-   }
-
-
-
    /*******************************************************************************
     ** Accessor for processState - protected, because we generally want to access
     ** its members through wrapper methods, we think
@@ -567,54 +524,4 @@ public class RunBackendStepInput extends AbstractActionInput
       return (this);
    }
 
-
-
-   /*******************************************************************************
-    ** Setter for processTracer
-    *******************************************************************************/
-   public void setProcessTracer(ProcessTracerInterface processTracer)
-   {
-      this.processTracer = processTracer;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for processTracer
-    *******************************************************************************/
-   public RunBackendStepInput withProcessTracer(ProcessTracerInterface processTracer)
-   {
-      this.processTracer = processTracer;
-      return (this);
-   }
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   public Optional<ProcessTracerInterface> getProcessTracer()
-   {
-      return Optional.ofNullable(processTracer);
-   }
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   public void traceMessage(ProcessTracerMessage message)
-   {
-      if(processTracer != null && message != null)
-      {
-         try
-         {
-            processTracer.handleMessage(this, message);
-         }
-         catch(Exception e)
-         {
-            LOG.warn("Error tracing message", e, logPair("message", message));
-         }
-      }
-   }
 }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/processes/RunBackendStepOutput.java

@@ -33,7 +33,6 @@ import com.kingsrook.qqq.backend.core.model.actions.AbstractActionOutput;
 import com.kingsrook.qqq.backend.core.model.actions.audits.AuditInput;
 import com.kingsrook.qqq.backend.core.model.actions.audits.AuditSingleInput;
 import com.kingsrook.qqq.backend.core.model.data.QRecord;
-import com.kingsrook.qqq.backend.core.model.data.QRecordEntity;
 import com.kingsrook.qqq.backend.core.model.metadata.processes.QFrontendStepMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.processes.QProcessMetaData;
 import com.kingsrook.qqq.backend.core.utils.ValueUtils;
@@ -259,7 +258,7 @@ public class RunBackendStepOutput extends AbstractActionOutput implements Serial
 
 
    /*******************************************************************************
-    ** add a record to the step output, e.g., for going through to the next step.
+    **
     *******************************************************************************/
    public void addRecord(QRecord record)
    {
@@ -272,16 +271,6 @@ public class RunBackendStepOutput extends AbstractActionOutput implements Serial
 
 
 
-   /***************************************************************************
-    ** add a RecordEntity to the step output, e.g., for going through to the next step.
-    ***************************************************************************/
-   public void addRecordEntity(QRecordEntity recordEntity)
-   {
-      addRecord(recordEntity.toQRecord());
-   }
-
-
-
    /*******************************************************************************
     ** Getter for auditInputList
     *******************************************************************************/
@@ -385,13 +374,7 @@ public class RunBackendStepOutput extends AbstractActionOutput implements Serial
          .map(step -> (QFrontendStepMetaData) step)
          .toList());
 
-      ProcessMetaDataAdjustment processMetaDataAdjustment = getProcessMetaDataAdjustment();
-      if(processMetaDataAdjustment == null)
-      {
-         processMetaDataAdjustment = new ProcessMetaDataAdjustment();
-      }
-      processMetaDataAdjustment.setUpdatedFrontendStepList(updatedFrontendStepList);
-      setProcessMetaDataAdjustment(processMetaDataAdjustment);
+      setUpdatedFrontendStepList(updatedFrontendStepList);
    }
 
 
@@ -428,21 +411,21 @@ public class RunBackendStepOutput extends AbstractActionOutput implements Serial
 
 
    /*******************************************************************************
-    ** Getter for ProcessMetaDataAdjustment (pass-through to processState)
+    ** Getter for updatedFrontendStepList
     *******************************************************************************/
-   public ProcessMetaDataAdjustment getProcessMetaDataAdjustment()
+   public List<QFrontendStepMetaData> getUpdatedFrontendStepList()
    {
-      return (this.processState.getProcessMetaDataAdjustment());
+      return (this.processState.getUpdatedFrontendStepList());
    }
 
 
 
    /*******************************************************************************
-    ** Setter for updatedFrontendStepList (pass-through to processState)
+    ** Setter for updatedFrontendStepList
     *******************************************************************************/
-   public void setProcessMetaDataAdjustment(ProcessMetaDataAdjustment processMetaDataAdjustment)
+   public void setUpdatedFrontendStepList(List<QFrontendStepMetaData> updatedFrontendStepList)
    {
-      this.processState.setProcessMetaDataAdjustment(processMetaDataAdjustment);
+      this.processState.setUpdatedFrontendStepList(updatedFrontendStepList);
    }
 
 }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/processes/RunProcessInput.java

@@ -49,7 +49,6 @@ public class RunProcessInput extends AbstractActionInput
    private ProcessState         processState;
    private FrontendStepBehavior frontendStepBehavior = FrontendStepBehavior.BREAK;
    private String               startAfterStep;
-   private String               startAtStep;
    private String               processUUID;
    private AsyncJobCallback     asyncJobCallback;
 
@@ -452,35 +451,4 @@ public class RunProcessInput extends AbstractActionInput
    {
       return asyncJobCallback;
    }
-
-   /*******************************************************************************
-    ** Getter for startAtStep
-    *******************************************************************************/
-   public String getStartAtStep()
-   {
-      return (this.startAtStep);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for startAtStep
-    *******************************************************************************/
-   public void setStartAtStep(String startAtStep)
-   {
-      this.startAtStep = startAtStep;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for startAtStep
-    *******************************************************************************/
-   public RunProcessInput withStartAtStep(String startAtStep)
-   {
-      this.startAtStep = startAtStep;
-      return (this);
-   }
-
-
 }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/processes/RunProcessOutput.java

@@ -33,7 +33,6 @@ import java.util.Optional;
 import com.kingsrook.qqq.backend.core.model.actions.AbstractActionOutput;
 import com.kingsrook.qqq.backend.core.model.data.QRecord;
 import com.kingsrook.qqq.backend.core.model.metadata.processes.QFrontendStepMetaData;
-import com.kingsrook.qqq.backend.core.utils.ObjectUtils;
 import com.kingsrook.qqq.backend.core.utils.ValueUtils;
 
 
@@ -337,12 +336,7 @@ public class RunProcessOutput extends AbstractActionOutput implements Serializab
     *******************************************************************************/
    public void setUpdatedFrontendStepList(List<QFrontendStepMetaData> updatedFrontendStepList)
    {
-      if(this.processState.getProcessMetaDataAdjustment() == null)
-      {
-         this.processState.setProcessMetaDataAdjustment(new ProcessMetaDataAdjustment());
-      }
-
-      this.processState.getProcessMetaDataAdjustment().setUpdatedFrontendStepList(updatedFrontendStepList);
+      this.processState.setUpdatedFrontendStepList(updatedFrontendStepList);
    }
 
 
@@ -352,27 +346,7 @@ public class RunProcessOutput extends AbstractActionOutput implements Serializab
     *******************************************************************************/
    public List<QFrontendStepMetaData> getUpdatedFrontendStepList()
    {
-      return ObjectUtils.tryElse(() -> this.processState.getProcessMetaDataAdjustment().getUpdatedFrontendStepList(), null);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for processMetaDataAdjustment
-    *******************************************************************************/
-   public ProcessMetaDataAdjustment getProcessMetaDataAdjustment()
-   {
-      return (this.processState.getProcessMetaDataAdjustment());
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for processMetaDataAdjustment
-    *******************************************************************************/
-   public void setProcessMetaDataAdjustment(ProcessMetaDataAdjustment processMetaDataAdjustment)
-   {
-      this.processState.setProcessMetaDataAdjustment(processMetaDataAdjustment);
+      return this.processState.getUpdatedFrontendStepList();
    }
 
 }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/aggregate/AggregateInput.java

@@ -59,30 +59,6 @@ public class AggregateInput extends AbstractTableActionInput
 
 
 
-   /*******************************************************************************
-    ** Constructor
-    **
-    *******************************************************************************/
-   public AggregateInput(String tableName)
-   {
-      this();
-      setTableName(tableName);
-   }
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   @Override
-   public AggregateInput withTableName(String tableName)
-   {
-      super.withTableName(tableName);
-      return (this);
-   }
-
-
-
    /*******************************************************************************
     ** Getter for filter
     **