CE-1328 Add job status messages

.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: |
@@ -48,11 +45,7 @@ commands:
       - run:
           name: Run Maven Verify
           command: |
-            mvn -s .circleci/mvn-settings.xml -T4 verify | tee mvn-verify.log
-      - store_artifacts:
-          name: Full Maven Verify Log
-          path: mvn-verify.log
-          destination: mvn-verify
+            mvn -s .circleci/mvn-settings.xml -T4 verify
       - store_jacoco_site:
           module: qqq-backend-core
       - store_jacoco_site:
@@ -86,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
@@ -134,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:
@@ -145,7 +130,6 @@ jobs:
       ## - localstack/startup
       - install_java17
       - mvn_verify
-      - check_middleware_api_versions
 
   mvn_deploy:
     executor: localstack/default
@@ -153,7 +137,6 @@ jobs:
       ## - localstack/startup
       - install_java17
       - mvn_verify
-      - check_middleware_api_versions
       - mvn_jar_deploy
 
   publish_asciidoc:
@@ -161,6 +144,7 @@ jobs:
     steps:
       - install_asciidoctor
       - run_asciidoctor
+      - upload_docs_site
 
 workflows:
   test_only:

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,

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.
@@ -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.

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,7 +46,7 @@
    </modules>
 
    <properties>
-      <revision>0.25.0-SNAPSHOT</revision>
+      <revision>0.21.0-SNAPSHOT</revision>
 
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

qqq-backend-core/pom.xml

@@ -65,11 +65,7 @@
          <artifactId>aws-java-sdk-secretsmanager</artifactId>
          <version>1.12.385</version>
       </dependency>
-      <dependency>
-         <groupId>com.ibm.icu</groupId>
-         <artifactId>icu4j</artifactId>
-         <version>77.1</version>
-      </dependency>
+
       <dependency>
          <groupId>com.fasterxml.jackson.core</groupId>
          <artifactId>jackson-databind</artifactId>
@@ -104,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>
@@ -121,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>
@@ -155,21 +138,16 @@
          <version>2.3</version>
       </dependency>
 
-      <!-- the next 3 deps are for html to pdf -->
+      <!-- the next 2 deps are for html to pdf - per https://www.baeldung.com/java-html-to-pdf -->
       <dependency>
          <groupId>org.jsoup</groupId>
          <artifactId>jsoup</artifactId>
          <version>1.15.3</version>
       </dependency>
       <dependency>
-         <groupId>com.openhtmltopdf</groupId>
-         <artifactId>openhtmltopdf-core</artifactId>
-         <version>1.0.10</version>
-      </dependency>
-      <dependency>
-         <groupId>com.openhtmltopdf</groupId>
-         <artifactId>openhtmltopdf-pdfbox</artifactId>
-         <version>1.0.10</version>
+         <groupId>org.xhtmlrenderer</groupId>
+         <artifactId>flying-saucer-pdf-openpdf</artifactId>
+         <version>9.1.22</version>
       </dependency>
 
       <!-- the next 3 deps are being added for google drive support -->

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

@@ -186,7 +186,7 @@ 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("End of job summary", logPair("recordCount", recordCount), logPair("jobName", jobName), logPair("millis", endTime - jobStartTime), logPair("recordsPerSecond", 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/RunRecordScriptAutomationHandler.java

@@ -83,7 +83,7 @@ public class RunRecordScriptAutomationHandler extends RecordAutomationHandler
       }
 
       QRecord scriptRevision = queryOutput.getRecords().get(0);
-      LOG.debug("Running script against records", logPair("scriptRevisionId", scriptRevision.getValue("id")), logPair("scriptId", scriptRevision.getValue("scriptIdd")));
+      LOG.info("Running script against records", logPair("scriptRevisionId", scriptRevision.getValue("id")), logPair("scriptId", scriptRevision.getValue("scriptIdd")));
 
       RunAdHocRecordScriptInput input = new RunAdHocRecordScriptInput();
       input.setCodeReference(new AdHocScriptCodeReference().withScriptRevisionRecord(scriptRevision));

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

@@ -649,7 +649,7 @@ public class PollingAutomationPerTableRunner implements Runnable
          input.setRecordList(records);
          input.setAction(action);
 
-         RecordAutomationHandler recordAutomationHandler = QCodeLoader.getAdHoc(RecordAutomationHandler.class, action.getCodeReference());
+         RecordAutomationHandler recordAutomationHandler = QCodeLoader.getRecordAutomationHandler(action);
          recordAutomationHandler.execute(input);
       }
    }

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

@@ -24,11 +24,17 @@ package com.kingsrook.qqq.backend.core.actions.customizers;
 
 import java.lang.reflect.Constructor;
 import java.util.Optional;
+import java.util.function.Function;
+import com.kingsrook.qqq.backend.core.actions.automation.RecordAutomationHandler;
+import com.kingsrook.qqq.backend.core.actions.processes.BackendStep;
+import com.kingsrook.qqq.backend.core.actions.values.QCustomPossibleValueProvider;
+import com.kingsrook.qqq.backend.core.exceptions.QException;
 import com.kingsrook.qqq.backend.core.logging.QLogger;
-import com.kingsrook.qqq.backend.core.model.metadata.code.InitializableViaCodeReference;
 import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeReference;
 import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeType;
+import com.kingsrook.qqq.backend.core.model.metadata.possiblevalues.QPossibleValueSource;
 import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
+import com.kingsrook.qqq.backend.core.model.metadata.tables.automation.TableAutomationAction;
 import com.kingsrook.qqq.backend.core.utils.lambdas.UnsafeFunction;
 import com.kingsrook.qqq.backend.core.utils.memoization.Memoization;
 import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
@@ -37,7 +43,9 @@ import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
 /*******************************************************************************
  ** Utility to load code for running QQQ customizers.
  **
- ** That memoization causes 1,000,000 such calls to go from ~500ms to ~100ms.
+ ** TODO - redo all to go through method that memoizes class & constructor
+ ** lookup.  That memoziation causes 1,000,000 such calls to go from ~500ms
+ ** to ~100ms.
  *******************************************************************************/
 public class QCodeLoader
 {
@@ -62,6 +70,84 @@ public class QCodeLoader
 
 
 
+   /*******************************************************************************
+    **
+    *******************************************************************************/
+   @SuppressWarnings("unchecked")
+   public static <T, R> Function<T, R> getFunction(QCodeReference codeReference)
+   {
+      if(codeReference == null)
+      {
+         return (null);
+      }
+
+      if(!codeReference.getCodeType().equals(QCodeType.JAVA))
+      {
+         ///////////////////////////////////////////////////////////////////////////////////////
+         // todo - 1) support more languages, 2) wrap them w/ java Functions here, 3) profit! //
+         ///////////////////////////////////////////////////////////////////////////////////////
+         throw (new IllegalArgumentException("Only JAVA customizers are supported at this time."));
+      }
+
+      try
+      {
+         Class<?> customizerClass = Class.forName(codeReference.getName());
+         return ((Function<T, R>) customizerClass.getConstructor().newInstance());
+      }
+      catch(Exception e)
+      {
+         LOG.error("Error initializing customizer", e, logPair("codeReference", codeReference));
+
+         //////////////////////////////////////////////////////////////////////////////////////////////////////////
+         // return null here - under the assumption that during normal run-time operations, we'll never hit here //
+         // as we'll want to validate all functions in the instance validator at startup time (and IT will throw //
+         // if it finds an invalid code reference                                                                //
+         //////////////////////////////////////////////////////////////////////////////////////////////////////////
+         return (null);
+      }
+   }
+
+
+
+   /*******************************************************************************
+    **
+    *******************************************************************************/
+   @SuppressWarnings("unchecked")
+   public static <T extends BackendStep> T getBackendStep(Class<T> expectedType, QCodeReference codeReference)
+   {
+      if(codeReference == null)
+      {
+         return (null);
+      }
+
+      if(!codeReference.getCodeType().equals(QCodeType.JAVA))
+      {
+         ///////////////////////////////////////////////////////////////////////////////////////
+         // todo - 1) support more languages, 2) wrap them w/ java Functions here, 3) profit! //
+         ///////////////////////////////////////////////////////////////////////////////////////
+         throw (new IllegalArgumentException("Only JAVA BackendSteps are supported at this time."));
+      }
+
+      try
+      {
+         Class<?> customizerClass = Class.forName(codeReference.getName());
+         return ((T) customizerClass.getConstructor().newInstance());
+      }
+      catch(Exception e)
+      {
+         LOG.error("Error initializing customizer", e, logPair("codeReference", codeReference));
+
+         //////////////////////////////////////////////////////////////////////////////////////////////////////////
+         // return null here - under the assumption that during normal run-time operations, we'll never hit here //
+         // as we'll want to validate all functions in the instance validator at startup time (and IT will throw //
+         // if it finds an invalid code reference                                                                //
+         //////////////////////////////////////////////////////////////////////////////////////////////////////////
+         return (null);
+      }
+   }
+
+
+
    /*******************************************************************************
     **
     *******************************************************************************/
@@ -91,17 +177,7 @@ public class QCodeLoader
 
          if(constructor.isPresent())
          {
-            T t = (T) constructor.get().newInstance();
-
-            ////////////////////////////////////////////////////////////////
-            // if the object is initializable, then, well, initialize it! //
-            ////////////////////////////////////////////////////////////////
-            if(t instanceof InitializableViaCodeReference initializableViaCodeReference)
-            {
-               initializableViaCodeReference.initialize(codeReference);
-            }
-
-            return t;
+            return ((T) constructor.get().newInstance());
          }
          else
          {
@@ -111,7 +187,7 @@ public class QCodeLoader
       }
       catch(Exception e)
       {
-         LOG.error("Error initializing codeReference", e, logPair("codeReference", codeReference));
+         LOG.error("Error initializing customizer", e, logPair("codeReference", codeReference));
 
          //////////////////////////////////////////////////////////////////////////////////////////////////////////
          // return null here - under the assumption that during normal run-time operations, we'll never hit here //
@@ -122,4 +198,67 @@ public class QCodeLoader
       }
    }
 
+
+
+   /*******************************************************************************
+    **
+    *******************************************************************************/
+   public static RecordAutomationHandler getRecordAutomationHandler(TableAutomationAction action) throws QException
+   {
+      try
+      {
+         QCodeReference codeReference = action.getCodeReference();
+         if(!codeReference.getCodeType().equals(QCodeType.JAVA))
+         {
+            ///////////////////////////////////////////////////////////////////////////////////////
+            // todo - 1) support more languages, 2) wrap them w/ java Functions here, 3) profit! //
+            ///////////////////////////////////////////////////////////////////////////////////////
+            throw (new IllegalArgumentException("Only JAVA customizers are supported at this time."));
+         }
+
+         Class<?> codeClass  = Class.forName(codeReference.getName());
+         Object   codeObject = codeClass.getConstructor().newInstance();
+         if(!(codeObject instanceof RecordAutomationHandler recordAutomationHandler))
+         {
+            throw (new QException("The supplied code [" + codeClass.getName() + "] is not an instance of RecordAutomationHandler"));
+         }
+         return (recordAutomationHandler);
+      }
+      catch(QException qe)
+      {
+         throw (qe);
+      }
+      catch(Exception e)
+      {
+         throw (new QException("Error getting record automation handler for action [" + action.getName() + "]", e));
+      }
+   }
+
+
+
+   /*******************************************************************************
+    **
+    *******************************************************************************/
+   public static QCustomPossibleValueProvider getCustomPossibleValueProvider(QPossibleValueSource possibleValueSource) throws QException
+   {
+      try
+      {
+         Class<?> codeClass  = Class.forName(possibleValueSource.getCustomCodeReference().getName());
+         Object   codeObject = codeClass.getConstructor().newInstance();
+         if(!(codeObject instanceof QCustomPossibleValueProvider customPossibleValueProvider))
+         {
+            throw (new QException("The supplied code [" + codeClass.getName() + "] is not an instance of QCustomPossibleValueProvider"));
+         }
+         return (customPossibleValueProvider);
+      }
+      catch(QException qe)
+      {
+         throw (qe);
+      }
+      catch(Exception e)
+      {
+         throw (new QException("Error getting custom possible value provider for PVS [" + possibleValueSource.getName() + "]", e));
+      }
+   }
+
 }

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

@@ -24,13 +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 java.util.Optional;
 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;
@@ -146,33 +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);
-   }
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   static <T extends Serializable> T getValueFromRecordOrOldRecord(String fieldName, QRecord record, Serializable primaryKey, Optional<Map<Serializable, QRecord>> oldRecordMap)
-   {
-      T value = (T) record.getValue(fieldName);
-      if(value == null && primaryKey != null && oldRecordMap.isPresent() && oldRecordMap.get().containsKey(primaryKey))
-      {
-         value = (T) oldRecordMap.get().get(primaryKey).getValue(fieldName);
-      }
-      return value;
-   }
-
 }

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/AbstractHTMLWidgetRenderer.java

@@ -290,18 +290,7 @@ public abstract class AbstractHTMLWidgetRenderer extends AbstractWidgetRenderer
    /*******************************************************************************
     **
     *******************************************************************************/
-   @Deprecated(since = "call one that doesn't take input param")
    public static String linkRecordEdit(AbstractActionInput input, String tableName, Serializable recordId) throws QException
-   {
-      return linkRecordEdit(tableName, recordId);
-   }
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   public static String linkRecordEdit(String tableName, Serializable recordId) throws QException
    {
       String tablePath = QContext.getQInstance().getTablePath(tableName);
       return (tablePath + "/" + recordId + "/edit");
@@ -328,17 +317,7 @@ public abstract class AbstractHTMLWidgetRenderer extends AbstractWidgetRenderer
    /*******************************************************************************
     **
     *******************************************************************************/
-   @Deprecated(since = "call one that doesn't take input param")
    public static String linkProcessForFilter(AbstractActionInput input, String processName, QQueryFilter filter) throws QException
-   {
-      return linkProcessForFilter(processName, filter);
-   }
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   public static String linkProcessForFilter(String processName, QQueryFilter filter) throws QException
    {
       QProcessMetaData process = QContext.getQInstance().getProcess(processName);
       if(process == null)
@@ -358,21 +337,10 @@ public abstract class AbstractHTMLWidgetRenderer extends AbstractWidgetRenderer
 
 
 
-
    /*******************************************************************************
     **
     *******************************************************************************/
-   @Deprecated(since = "call one that doesn't take input param")
    public static String linkProcessForRecord(AbstractActionInput input, String processName, Serializable recordId) throws QException
-   {
-      return linkProcessForRecord(processName, recordId);
-   }
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   public static String linkProcessForRecord(String processName, Serializable recordId) throws QException
    {
       QProcessMetaData process   = QContext.getQInstance().getProcess(processName);
       String           tableName = process.getTableName();

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

@@ -37,8 +37,6 @@ 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 +51,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 +83,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 +168,6 @@ public class ChildRecordListRenderer extends AbstractWidgetRenderer
          widgetMetaData.withDefaultValue("manageAssociationName", manageAssociationName);
          return (this);
       }
-
    }
 
 
@@ -202,7 +194,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"));
          }
 
          //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -307,18 +299,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 +310,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/RecordListWidgetRenderer.java

@@ -1,251 +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.actions.dashboard.widgets;
-
-
-import java.net.URLEncoder;
-import java.nio.charset.Charset;
-import java.util.HashMap;
-import com.kingsrook.qqq.backend.core.actions.tables.CountAction;
-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.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.query.FilterUseCase;
-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.actions.widgets.RenderWidgetInput;
-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.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.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;
-import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
-
-
-/*******************************************************************************
- ** Generic widget to display a list of records.
- **
- ** Note, closely related to (and copied from ChildRecordListRenderer.
- ** opportunity to share more code with that in the future??
- *******************************************************************************/
-public class RecordListWidgetRenderer extends AbstractWidgetRenderer
-{
-   private static final QLogger LOG = QLogger.getLogger(RecordListWidgetRenderer.class);
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   public static Builder widgetMetaDataBuilder(String widgetName)
-   {
-      return (new Builder(new QWidgetMetaData()
-         .withName(widgetName)
-         .withIsCard(true)
-         .withCodeReference(new QCodeReference(RecordListWidgetRenderer.class))
-         .withType(WidgetType.CHILD_RECORD_LIST.getType())
-         .withValidatorPlugin(new RecordListWidgetValidator())
-      ));
-   }
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   public static class Builder extends AbstractWidgetMetaDataBuilder
-   {
-
-      /*******************************************************************************
-       ** Constructor
-       **
-       *******************************************************************************/
-      public Builder(QWidgetMetaData widgetMetaData)
-      {
-         super(widgetMetaData);
-      }
-
-
-
-      /*******************************************************************************
-       **
-       *******************************************************************************/
-      public Builder withLabel(String label)
-      {
-         widgetMetaData.setLabel(label);
-         return (this);
-      }
-
-
-
-      /*******************************************************************************
-       **
-       *******************************************************************************/
-      public Builder withMaxRows(Integer maxRows)
-      {
-         widgetMetaData.withDefaultValue("maxRows", maxRows);
-         return (this);
-      }
-
-
-
-      /*******************************************************************************
-       **
-       *******************************************************************************/
-      public Builder withTableName(String tableName)
-      {
-         widgetMetaData.withDefaultValue("tableName", tableName);
-         return (this);
-      }
-
-
-
-      /*******************************************************************************
-       **
-       *******************************************************************************/
-      public Builder withFilter(QQueryFilter filter)
-      {
-         widgetMetaData.withDefaultValue("filter", filter);
-         return (this);
-      }
-
-   }
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   @Override
-   public RenderWidgetOutput render(RenderWidgetInput input) throws QException
-   {
-      try
-      {
-         Integer maxRows = null;
-         if(StringUtils.hasContent(input.getQueryParams().get("maxRows")))
-         {
-            maxRows = ValueUtils.getValueAsInteger(input.getQueryParams().get("maxRows"));
-         }
-         else if(input.getWidgetMetaData().getDefaultValues().containsKey("maxRows"))
-         {
-            maxRows = ValueUtils.getValueAsInteger(input.getWidgetMetaData().getDefaultValues().get("maxRows"));
-         }
-
-         QQueryFilter filter = ((QQueryFilter) input.getWidgetMetaData().getDefaultValues().get("filter")).clone();
-         filter.interpretValues(new HashMap<>(input.getQueryParams()), FilterUseCase.DEFAULT);
-         filter.setLimit(maxRows);
-
-         String         tableName = ValueUtils.getValueAsString(input.getWidgetMetaData().getDefaultValues().get("tableName"));
-         QTableMetaData table     = QContext.getQInstance().getTable(tableName);
-
-         QueryInput queryInput = new QueryInput();
-         queryInput.setTableName(tableName);
-         queryInput.setShouldTranslatePossibleValues(true);
-         queryInput.setShouldGenerateDisplayValues(true);
-         queryInput.setFilter(filter);
-         QueryOutput queryOutput = new QueryAction().execute(queryInput);
-
-         QValueFormatter.setBlobValuesToDownloadUrls(table, queryOutput.getRecords());
-
-         int totalRows = queryOutput.getRecords().size();
-         if(maxRows != null && (queryOutput.getRecords().size() == maxRows))
-         {
-            /////////////////////////////////////////////////////////////////////////////////////
-            // if the input said to only do some max, and the # of results we got is that max, //
-            // then do a count query, for displaying 1-n of <count>                            //
-            /////////////////////////////////////////////////////////////////////////////////////
-            CountInput countInput = new CountInput();
-            countInput.setTableName(tableName);
-            countInput.setFilter(filter);
-            totalRows = new CountAction().execute(countInput).getCount();
-         }
-
-         String tablePath   = QContext.getQInstance().getTablePath(tableName);
-         String viewAllLink = tablePath == null ? null : (tablePath + "?filter=" + URLEncoder.encode(JsonUtils.toJson(filter), Charset.defaultCharset()));
-
-         ChildRecordListData widgetData = new ChildRecordListData(input.getQueryParams().get("widgetLabel"), queryOutput, table, tablePath, viewAllLink, totalRows);
-
-         return (new RenderWidgetOutput(widgetData));
-      }
-      catch(Exception e)
-      {
-         LOG.warn("Error rendering record list widget", e, logPair("widgetName", () -> input.getWidgetMetaData().getName()));
-         throw (e);
-      }
-   }
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   private static class RecordListWidgetValidator implements QInstanceValidatorPluginInterface<QWidgetMetaDataInterface>
-   {
-
-      /***************************************************************************
-       **
-       ***************************************************************************/
-      @Override
-      public void validate(QWidgetMetaDataInterface widgetMetaData, QInstance qInstance, QInstanceValidator qInstanceValidator)
-      {
-         String prefix = "Widget " + widgetMetaData.getName() + ": ";
-
-         //////////////////////////////////////////////
-         // make sure table name is given and exists //
-         //////////////////////////////////////////////
-         QTableMetaData table = null;
-         String tableName = ValueUtils.getValueAsString(CollectionUtils.nonNullMap(widgetMetaData.getDefaultValues()).get("tableName"));
-         if(qInstanceValidator.assertCondition(StringUtils.hasContent(tableName), prefix + "defaultValue for tableName must be given"))
-         {
-            ////////////////////////////
-            // make sure table exists //
-            ////////////////////////////
-            table = qInstance.getTable(tableName);
-            qInstanceValidator.assertCondition(table != null, prefix + "No table named " + tableName + " exists in the instance");
-         }
-
-         ////////////////////////////////////////////////////////////////////////////////////
-         // make sure filter is given and is valid (only check that if table is given too) //
-         ////////////////////////////////////////////////////////////////////////////////////
-         QQueryFilter filter = ((QQueryFilter) widgetMetaData.getDefaultValues().get("filter"));
-         if(qInstanceValidator.assertCondition(filter != null, prefix + "defaultValue for filter must be given") && table != null)
-         {
-            qInstanceValidator.validateQueryFilter(qInstance, prefix, table, filter, null);
-         }
-      }
-
-   }
-}

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

@@ -1,93 +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
- *******************************************************************************/
-@Deprecated(since = "migrated to metaDataCustomizer")
-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/DefaultNoopMetaDataActionCustomizer.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 is all noop.
- *******************************************************************************/
-public class DefaultNoopMetaDataActionCustomizer implements MetaDataActionCustomizerInterface
-{
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   @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

@@ -23,26 +23,18 @@ package com.kingsrook.qqq.backend.core.actions.metadata;
 
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 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.exceptions.QUserFacingException;
-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;
@@ -57,7 +49,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;
 
 
 /*******************************************************************************
@@ -66,12 +57,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, MetaDataActionCustomizerInterface> metaDataActionCustomizerMemoization = new Memoization<>();
-
-
-
    /*******************************************************************************
     **
     *******************************************************************************/
@@ -79,10 +64,10 @@ 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();
 
-      MetaDataActionCustomizerInterface customizer = getMetaDataActionCustomizer();
+      Map<String, AppTreeNode> treeNodes = new LinkedHashMap<>();
 
       /////////////////////////////////////
       // map tables to frontend metadata //
@@ -93,11 +78,6 @@ public class MetaDataAction
          String         tableName = entry.getKey();
          QTableMetaData table     = entry.getValue();
 
-         if(!customizer.allowTable(metaDataInput, table))
-         {
-            continue;
-         }
-
          PermissionCheckResult permissionResult = PermissionsHelper.getPermissionCheckResult(metaDataInput, table);
          if(permissionResult.equals(PermissionCheckResult.DENY_HIDE))
          {
@@ -122,11 +102,6 @@ public class MetaDataAction
          String           processName = entry.getKey();
          QProcessMetaData process     = entry.getValue();
 
-         if(!customizer.allowProcess(metaDataInput, process))
-         {
-            continue;
-         }
-
          PermissionCheckResult permissionResult = PermissionsHelper.getPermissionCheckResult(metaDataInput, process);
          if(permissionResult.equals(PermissionCheckResult.DENY_HIDE))
          {
@@ -147,11 +122,6 @@ public class MetaDataAction
          String          reportName = entry.getKey();
          QReportMetaData report     = entry.getValue();
 
-         if(!customizer.allowReport(metaDataInput, report))
-         {
-            continue;
-         }
-
          PermissionCheckResult permissionResult = PermissionsHelper.getPermissionCheckResult(metaDataInput, report);
          if(permissionResult.equals(PermissionCheckResult.DENY_HIDE))
          {
@@ -172,11 +142,6 @@ public class MetaDataAction
          String                   widgetName = entry.getKey();
          QWidgetMetaDataInterface widget     = entry.getValue();
 
-         if(!customizer.allowWidget(metaDataInput, widget))
-         {
-            continue;
-         }
-
          PermissionCheckResult permissionResult = PermissionsHelper.getPermissionCheckResult(metaDataInput, widget);
          if(permissionResult.equals(PermissionCheckResult.DENY_HIDE))
          {
@@ -209,19 +174,9 @@ public class MetaDataAction
             continue;
          }
 
-         if(!customizer.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())
@@ -235,42 +190,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);
 
@@ -295,65 +217,17 @@ public class MetaDataAction
          metaDataOutput.setBranding(QContext.getQInstance().getBranding());
       }
 
-      metaDataOutput.setEnvironmentValues(Objects.requireNonNullElse(QContext.getQInstance().getEnvironmentValues(), Collections.emptyMap()));
+      metaDataOutput.setEnvironmentValues(QContext.getQInstance().getEnvironmentValues());
 
-      metaDataOutput.setHelpContents(Objects.requireNonNullElse(QContext.getQInstance().getHelpContent(), Collections.emptyMap()));
+      metaDataOutput.setHelpContents(QContext.getQInstance().getHelpContent());
 
-      try
-      {
-         customizer.postProcess(metaDataOutput);
-      }
-      catch(QUserFacingException e)
-      {
-         LOG.debug("User-facing exception thrown in meta-data customizer post-processing", e);
-      }
-      catch(Exception e)
-      {
-         LOG.warn("Unexpected error thrown in meta-data customizer post-processing", e);
-      }
+      // todo post-customization - can do whatever w/ the result if you want?
 
       return metaDataOutput;
    }
 
 
 
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   private MetaDataActionCustomizerInterface getMetaDataActionCustomizer()
-   {
-      return metaDataActionCustomizerMemoization.getResult(QContext.getQInstance(), i ->
-      {
-         MetaDataActionCustomizerInterface actionCustomizer                  = null;
-         QCodeReference                    metaDataActionCustomizerReference = QContext.getQInstance().getMetaDataActionCustomizer();
-         if(metaDataActionCustomizerReference != null)
-         {
-            actionCustomizer = QCodeLoader.getAdHoc(MetaDataActionCustomizerInterface.class, metaDataActionCustomizerReference);
-            LOG.debug("Using new meta-data actionCustomizer of type: " + actionCustomizer.getClass().getSimpleName());
-         }
-
-         if(actionCustomizer == null)
-         {
-            QCodeReference metaDataFilterReference = QContext.getQInstance().getMetaDataFilter();
-            if(metaDataFilterReference != null)
-            {
-               actionCustomizer = QCodeLoader.getAdHoc(MetaDataActionCustomizerInterface.class, metaDataFilterReference);
-               LOG.debug("Using new meta-data actionCustomizer (via metaDataFilter reference) of type: " + actionCustomizer.getClass().getSimpleName());
-            }
-         }
-
-         if(actionCustomizer == null)
-         {
-            actionCustomizer = new DefaultNoopMetaDataActionCustomizer();
-            LOG.debug("Using new default (allow-all) meta-data actionCustomizer");
-         }
-
-         return (actionCustomizer);
-      }).orElseThrow(() -> new QRuntimeException("Error getting MetaDataActionCustomizer"));
-   }
-
-
-
    /*******************************************************************************
     **
     *******************************************************************************/

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/actions/metadata/MetaDataActionCustomizerInterface.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.actions.metadata;
-
-
-import com.kingsrook.qqq.backend.core.exceptions.QException;
-import com.kingsrook.qqq.backend.core.model.actions.metadata.MetaDataInput;
-import com.kingsrook.qqq.backend.core.model.actions.metadata.MetaDataOutput;
-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;
-
-
-/*******************************************************************************
- ** Interface for customizations that can be injected by an application into
- ** the MetaDataAction - e.g., loading applicable meta-data for a user into a
- ** frontend.
- *******************************************************************************/
-public interface MetaDataActionCustomizerInterface
-{
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   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);
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   default void postProcess(MetaDataOutput metaDataOutput) throws QException
-   {
-      /////////////////////
-      // noop by default //
-      /////////////////////
-   }
-
-}

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

@@ -1,32 +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;
-
-
-/*******************************************************************************
- **
- *******************************************************************************/
-@Deprecated(since = "migrated to metaDataCustomizer")
-public interface MetaDataFilterInterface extends MetaDataActionCustomizerInterface
-{
-
-}

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

@@ -36,19 +36,15 @@ import com.kingsrook.qqq.backend.core.exceptions.QUserFacingException;
 import com.kingsrook.qqq.backend.core.logging.QLogger;
 import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepInput;
 import com.kingsrook.qqq.backend.core.model.actions.processes.RunBackendStepOutput;
-import com.kingsrook.qqq.backend.core.model.actions.tables.query.QCriteriaOperator;
-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.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;
 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.tables.QTableMetaData;
 import com.kingsrook.qqq.backend.core.utils.CollectionUtils;
 
 
@@ -191,40 +187,21 @@ public class RunBackendStepAction
       {
          if(CollectionUtils.nullSafeIsEmpty(runBackendStepInput.getRecords()))
          {
-            QTableMetaData table      = QContext.getQInstance().getTable(inputMetaData.getRecordListMetaData().getTableName());
-            QueryInput     queryInput = new QueryInput();
-            queryInput.setTableName(table.getName());
+            QueryInput queryInput = new QueryInput();
+            queryInput.setTableName(inputMetaData.getRecordListMetaData().getTableName());
 
-            //////////////////////////////////////////////////
-            // look for record ids in the input data values //
-            //////////////////////////////////////////////////
-            String recordIds = (String) runBackendStepInput.getValue("recordIds");
-            if(recordIds == null)
+            // todo - handle this being async (e.g., http)
+            // seems like it just needs to throw, breaking this flow, and to send a response to the frontend, directing it to prompt the user for the needed data
+            // then this step can re-run, hopefully with the needed data.
+
+            QProcessCallback callback = runBackendStepInput.getCallback();
+            if(callback == null)
             {
-               recordIds = (String) runBackendStepInput.getValue("recordId");
+               throw (new QUserFacingException("Missing input records.",
+                  new QException("Function is missing input records, but no callback was present to request fields from a user")));
             }
 
-            ///////////////////////////////////////////////////////////
-            // if records were found, add as criteria to query input //
-            ///////////////////////////////////////////////////////////
-            if(recordIds != null)
-            {
-               queryInput.setFilter(new QQueryFilter(new QFilterCriteria(table.getPrimaryKeyField(), QCriteriaOperator.IN, recordIds.split(","))));
-            }
-            else
-            {
-               // todo - handle this being async (e.g., http)
-               // seems like it just needs to throw, breaking this flow, and to send a response to the frontend, directing it to prompt the user for the needed data
-               // then this step can re-run, hopefully with the needed data.
-               QProcessCallback callback = runBackendStepInput.getCallback();
-               if(callback == null)
-               {
-                  throw (new QUserFacingException("Missing input records.",
-                     new QException("Function is missing input records, but no callback was present to request fields from a user")));
-               }
-
-               queryInput.setFilter(callback.getQueryFilter());
-            }
+            queryInput.setFilter(callback.getQueryFilter());
 
             //////////////////////////////////////////////////////////////////////////////////////////
             // if process has a max-no of records, set a limit on the process of that number plus 1 //
@@ -232,7 +209,7 @@ public class RunBackendStepAction
             //////////////////////////////////////////////////////////////////////////////////////////
             if(process.getMaxInputRecords() != null)
             {
-               if(queryInput.getFilter() == null)
+               if(callback.getQueryFilter() == null)
                {
                   queryInput.setFilter(new QQueryFilter());
                }
@@ -280,20 +257,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;
-
 
 
    /*******************************************************************************
@@ -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/reporting/CsvExportStreamer.java

@@ -108,7 +108,7 @@ public class CsvExportStreamer implements ExportStreamerInterface
       }
       catch(Exception e)
       {
-         throw (new QReportingException("Error starting CSV report", e));
+         throw (new QReportingException("Error starting CSV report"));
       }
    }
 

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

@@ -54,14 +54,6 @@ public interface ExportStreamerInterface
       // noop in base class
    }
 
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   default void setExportStyleCustomizer(ExportStyleCustomizerInterface exportStyleCustomizer)
-   {
-      // noop in base class
-   }
-
    /*******************************************************************************
     ** Called once per sheet, before any rows are available.  Meant to write a
     ** header, for example.

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

@@ -1,35 +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.actions.reporting;
-
-
-/*******************************************************************************
- ** interface for classes that can be used to customize visual style aspects of
- ** exports/reports.
- **
- ** Anticipates very different sub-interfaces based on the file type being generated,
- ** and the capabilities of each.  e.g., excel (bolds, fonts, cell merging) vs
- ** json (different structure of objects).
- *******************************************************************************/
-public interface ExportStyleCustomizerInterface
-{
-}

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,12 @@ 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;
@@ -163,17 +159,6 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
          reportStreamer = reportFormat.newReportStreamer();
       }
 
-      if(reportInput.getExportStyleCustomizer() != null)
-      {
-         ExportStyleCustomizerInterface styleCustomizer = QCodeLoader.getAdHoc(ExportStyleCustomizerInterface.class, reportInput.getExportStyleCustomizer());
-         reportStreamer.setExportStyleCustomizer(styleCustomizer);
-      }
-      else if(report.getExportStyleCustomizer() != null)
-      {
-         ExportStyleCustomizerInterface styleCustomizer = QCodeLoader.getAdHoc(ExportStyleCustomizerInterface.class, report.getExportStyleCustomizer());
-         reportStreamer.setExportStyleCustomizer(styleCustomizer);
-      }
-
       reportStreamer.preRun(reportInput.getReportDestination(), views);
 
       ////////////////////////////////////////////////////////////////////////////////////////////////
@@ -222,8 +207,7 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
                /////////////////////////////////////////////////////////////////////////////////////////
                if(dataSourceTableView.getViewCustomizer() != null)
                {
-                  @SuppressWarnings("unchecked")
-                  Function<QReportView, QReportView> viewCustomizerFunction = QCodeLoader.getAdHoc(Function.class, dataSourceTableView.getViewCustomizer());
+                  Function<QReportView, QReportView> viewCustomizerFunction = QCodeLoader.getFunction(dataSourceTableView.getViewCustomizer());
                   if(viewCustomizerFunction instanceof ReportViewCustomizer reportViewCustomizer)
                   {
                      reportViewCustomizer.setReportInput(reportInput);
@@ -318,19 +302,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(QContext.getQInstance(), dataSource.getSourceTable(), cloneDataSourceQueryJoins(dataSource), dataSource.getQueryFilter() == null ? null : dataSource.getQueryFilter().clone());
+            countDataSourceRecords(reportInput, dataSource, reportFormat);
          }
       }
 
@@ -354,7 +329,6 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
             field.setName(column.getName());
             if(StringUtils.hasContent(column.getLabel()))
             {
-
                field.setLabel(column.getLabel());
             }
             fields.add(field);
@@ -372,33 +346,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(cloneDataSourceQueryJoins(dataSource));
+      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 + ")."));
          }
       }
@@ -459,19 +423,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);
@@ -580,7 +538,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);
@@ -593,6 +551,32 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
 
 
 
+   /*******************************************************************************
+    **
+    *******************************************************************************/
+   public static FieldAndJoinTable getFieldAndJoinTable(QTableMetaData mainTable, String fieldName) throws QException
+   {
+      if(fieldName.indexOf('.') > -1)
+      {
+         String joinTableName = fieldName.replaceAll("\\..*", "");
+         String joinFieldName = fieldName.replaceAll(".*\\.", "");
+
+         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
+      {
+         return new FieldAndJoinTable(mainTable.getField(fieldName), mainTable);
+      }
+   }
+
+
+
    /*******************************************************************************
     **
     *******************************************************************************/
@@ -603,56 +587,7 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
          return;
       }
 
-      //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-      // 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();
-      }
-      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;
-      }
+      queryFilter.interpretValues(reportInput.getInputValues());
    }
 
 
@@ -672,7 +607,7 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
          ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
          // if any fields are 'showPossibleValueLabel', then move display values for them into the record's values map //
          ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-         for(QReportField column : CollectionUtils.nonNullList(tableView.getColumns()))
+         for(QReportField column : tableView.getColumns())
          {
             if(column.getShowPossibleValueLabel())
             {
@@ -743,7 +678,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)
             {
@@ -798,7 +733,7 @@ public class GenerateReportAction extends AbstractQActionFunction<ReportInput, R
             //////////////////////////////////////////////////////
             // 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)
@@ -943,7 +878,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())
@@ -1195,4 +1130,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/poi/ExcelPoiBasedStreamingExportStreamer.java

@@ -46,7 +46,6 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
 import com.kingsrook.qqq.backend.core.actions.reporting.ExportStreamerInterface;
-import com.kingsrook.qqq.backend.core.actions.reporting.ExportStyleCustomizerInterface;
 import com.kingsrook.qqq.backend.core.actions.reporting.ReportUtils;
 import com.kingsrook.qqq.backend.core.exceptions.QReportingException;
 import com.kingsrook.qqq.backend.core.instances.QInstanceEnricher;
@@ -78,7 +77,6 @@ import org.apache.poi.xssf.usermodel.XSSFPivotTable;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
 
 
 /*******************************************************************************
@@ -114,10 +112,9 @@ public class ExcelPoiBasedStreamingExportStreamer implements ExportStreamerInter
    public static final String EXCEL_DATE_FORMAT      = "yyyy-MM-dd";
    public static final String EXCEL_DATE_TIME_FORMAT = "yyyy-MM-dd H:mm:ss";
 
-   private ExcelPoiBasedStreamingStyleCustomizerInterface styleCustomizerInterface;
-
+   private PoiExcelStylerInterface    poiExcelStylerInterface = getStylerInterface();
    private Map<String, String>        excelCellFormats;
-   private Map<String, XSSFCellStyle> styles = new HashMap<>();
+   private Map<String, XSSFCellStyle> styles                  = new HashMap<>();
 
    private int rowNo      = 0;
    private int sheetIndex = 1;
@@ -127,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<>();
 
 
 
@@ -184,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++;
          }
 
@@ -405,7 +400,6 @@ public class ExcelPoiBasedStreamingExportStreamer implements ExportStreamerInter
       dateTimeStyle.setDataFormat(createHelper.createDataFormat().getFormat(EXCEL_DATE_TIME_FORMAT));
       styles.put("datetime", dateTimeStyle);
 
-      PoiExcelStylerInterface poiExcelStylerInterface = getStylerInterface();
       styles.put("title", poiExcelStylerInterface.createStyleForTitle(workbook, createHelper));
       styles.put("header", poiExcelStylerInterface.createStyleForHeader(workbook, createHelper));
       styles.put("footer", poiExcelStylerInterface.createStyleForFooter(workbook, createHelper));
@@ -417,11 +411,6 @@ public class ExcelPoiBasedStreamingExportStreamer implements ExportStreamerInter
       XSSFCellStyle footerDateTimeStyle = poiExcelStylerInterface.createStyleForFooter(workbook, createHelper);
       footerDateTimeStyle.setDataFormat(createHelper.createDataFormat().getFormat(EXCEL_DATE_TIME_FORMAT));
       styles.put("footer-datetime", footerDateTimeStyle);
-
-      if(styleCustomizerInterface != null)
-      {
-         styleCustomizerInterface.customizeStyles(styles, workbook, createHelper);
-      }
    }
 
 
@@ -457,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);
 
@@ -467,7 +456,7 @@ public class ExcelPoiBasedStreamingExportStreamer implements ExportStreamerInter
          }
          else
          {
-            sheetWriter.beginSheet(view, styleCustomizerInterface);
+            sheetWriter.beginSheet();
 
             ////////////////////////////////////////////////
             // put the title and header rows in the sheet //
@@ -569,16 +558,6 @@ public class ExcelPoiBasedStreamingExportStreamer implements ExportStreamerInter
 
 
 
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   public static void setStyleForField(QRecord record, String fieldName, String styleName)
-   {
-      record.setDisplayValue(fieldName + ":excelStyle", styleName);
-   }
-
-
-
    /*******************************************************************************
     **
     *******************************************************************************/
@@ -586,12 +565,12 @@ public class ExcelPoiBasedStreamingExportStreamer implements ExportStreamerInter
    {
       sheetWriter.insertRow(rowNo++);
 
-      int baseStyleIndex     = -1;
+      int styleIndex         = -1;
       int dateStyleIndex     = styles.get("date").getIndex();
       int dateTimeStyleIndex = styles.get("datetime").getIndex();
       if(isFooter)
       {
-         baseStyleIndex = styles.get("footer").getIndex();
+         styleIndex = styles.get("footer").getIndex();
          dateStyleIndex = styles.get("footer-date").getIndex();
          dateTimeStyleIndex = styles.get("footer-datetime").getIndex();
       }
@@ -601,13 +580,6 @@ public class ExcelPoiBasedStreamingExportStreamer implements ExportStreamerInter
       {
          Serializable value = qRecord.getValue(field.getName());
 
-         String overrideStyleName = qRecord.getDisplayValue(field.getName() + ":excelStyle");
-         int    styleIndex        = baseStyleIndex;
-         if(overrideStyleName != null)
-         {
-            styleIndex = styles.get(overrideStyleName).getIndex();
-         }
-
          if(value != null)
          {
             if(value instanceof String s)
@@ -732,7 +704,7 @@ public class ExcelPoiBasedStreamingExportStreamer implements ExportStreamerInter
       {
          if(!ReportType.PIVOT.equals(currentView.getType()))
          {
-            sheetWriter.endSheet(currentView, styleCustomizerInterface);
+            sheetWriter.endSheet();
          }
 
          activeSheetWriter.flush();
@@ -841,29 +813,7 @@ public class ExcelPoiBasedStreamingExportStreamer implements ExportStreamerInter
     *******************************************************************************/
    protected PoiExcelStylerInterface getStylerInterface()
    {
-      if(styleCustomizerInterface != null)
-      {
-         return styleCustomizerInterface.getExcelStyler();
-      }
-
       return (new PlainPoiExcelStyler());
    }
 
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   @Override
-   public void setExportStyleCustomizer(ExportStyleCustomizerInterface exportStyleCustomizer)
-   {
-      if(exportStyleCustomizer instanceof ExcelPoiBasedStreamingStyleCustomizerInterface poiExcelStylerInterface)
-      {
-         this.styleCustomizerInterface = poiExcelStylerInterface;
-      }
-      else
-      {
-         LOG.debug("Supplied export style customizer is not an instance of ExcelPoiStyleCustomizerInterface, so will not be used for an excel export", logPair("exportStyleCustomizerClass", exportStyleCustomizer.getClass().getSimpleName()));
-      }
-   }
 }

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

@@ -1,81 +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.actions.reporting.excel.poi;
-
-
-import java.util.List;
-import java.util.Map;
-import com.kingsrook.qqq.backend.core.actions.reporting.ExportStyleCustomizerInterface;
-import com.kingsrook.qqq.backend.core.model.metadata.reporting.QReportView;
-import org.apache.poi.ss.usermodel.CreationHelper;
-import org.apache.poi.xssf.usermodel.XSSFCellStyle;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
-
-/*******************************************************************************
- ** style customization points for Excel files generated via our streaming POI.
- *******************************************************************************/
-public interface ExcelPoiBasedStreamingStyleCustomizerInterface extends ExportStyleCustomizerInterface
-{
-   /***************************************************************************
-    ** slightly legacy way we did excel styles - but get an instance of object
-    ** that defaults "default" styles (header, footer, etc).
-    ***************************************************************************/
-   default PoiExcelStylerInterface getExcelStyler()
-   {
-      return (new PlainPoiExcelStyler());
-   }
-
-
-   /***************************************************************************
-    ** either change "default" styles put in the styles map, or create new ones
-    ** which can then be applied to row/field values (cells) via:
-    ** ExcelPoiBasedStreamingExportStreamer.setStyleForField(row, fieldName, styleName);
-    ***************************************************************************/
-   default void customizeStyles(Map<String, XSSFCellStyle> styles, XSSFWorkbook workbook, CreationHelper createHelper)
-   {
-      //////////////////
-      // noop default //
-      //////////////////
-   }
-
-
-   /***************************************************************************
-    ** for a given view (sheet), return a list of custom column widths.
-    ** any nulls in the list are ignored (so default width is used).
-    ***************************************************************************/
-   default List<Integer> getColumnWidthsForView(QReportView view)
-   {
-      return (null);
-   }
-
-
-   /***************************************************************************
-    ** for a given view (sheet), return a list of any ranges which should be
-    ** merged, as in "A1:C1" (first three cells in first row).
-    ***************************************************************************/
-   default List<String> getMergedRangesForView(QReportView view)
-   {
-      return (null);
-   }
-
-}

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

@@ -25,10 +25,7 @@ package com.kingsrook.qqq.backend.core.actions.reporting.excel.poi;
 import java.io.IOException;
 import java.io.Writer;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
-import com.kingsrook.qqq.backend.core.model.metadata.reporting.QReportView;
-import com.kingsrook.qqq.backend.core.utils.CollectionUtils;
 import org.apache.poi.ss.util.CellReference;
 
 
@@ -56,33 +53,13 @@ public class StreamedSheetWriter
    /*******************************************************************************
     **
     *******************************************************************************/
-   public void beginSheet(QReportView view, ExcelPoiBasedStreamingStyleCustomizerInterface styleCustomizerInterface) throws IOException
+   public void beginSheet() throws IOException
    {
       writer.write("""
          <?xml version="1.0" encoding="UTF-8"?>
-            <worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">""");
+            <worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main">
+               <sheetData>""");
 
-      if(styleCustomizerInterface != null && view != null)
-      {
-         List<Integer> columnWidths = styleCustomizerInterface.getColumnWidthsForView(view);
-         if(CollectionUtils.nullSafeHasContents(columnWidths))
-         {
-            writer.write("<cols>");
-            for(int i = 0; i < columnWidths.size(); i++)
-            {
-               Integer width = columnWidths.get(i);
-               if(width != null)
-               {
-                  writer.write("""
-                     <col min="%d" max="%d" width="%d" customWidth="1"/>
-                     """.formatted(i + 1, i + 1, width));
-               }
-            }
-            writer.write("</cols>");
-         }
-      }
-
-      writer.write("<sheetData>");
    }
 
 
@@ -90,25 +67,11 @@ public class StreamedSheetWriter
    /*******************************************************************************
     **
     *******************************************************************************/
-   public void endSheet(QReportView view, ExcelPoiBasedStreamingStyleCustomizerInterface styleCustomizerInterface) throws IOException
+   public void endSheet() throws IOException
    {
-      writer.write("</sheetData>");
-
-      if(styleCustomizerInterface != null && view != null)
-      {
-         List<String> mergedRanges = styleCustomizerInterface.getMergedRangesForView(view);
-         if(CollectionUtils.nullSafeHasContents(mergedRanges))
-         {
-            writer.write(String.format("<mergeCells count=\"%d\">", mergedRanges.size()));
-            for(String range : mergedRanges)
-            {
-               writer.write(String.format("<mergeCell ref=\"%s\"/>", range));
-            }
-            writer.write("</mergeCells>");
-         }
-      }
-
-      writer.write("</worksheet>");
+      writer.write("""
+            </sheetData>
+         </worksheet>""");
    }
 
 
@@ -188,7 +151,7 @@ public class StreamedSheetWriter
             {
                rs.append("&quot;");
             }
-            else if(c < 32 && c != '\t' && c != '\n')
+            else if (c < 32 && c != '\t' && c != '\n')
             {
                rs.append(' ');
             }

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

@@ -53,8 +53,7 @@ public class QJavaExecutor implements QCodeExecutor
       Serializable output;
       try
       {
-         @SuppressWarnings("unchecked")
-         Function<Map<String, Object>, Serializable> function = QCodeLoader.getAdHoc(Function.class, codeReference);
+         Function<Map<String, Object>, Serializable> function = QCodeLoader.getFunction(codeReference);
          output = function.apply(context);
       }
       catch(Exception e)

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

@@ -32,7 +32,6 @@ 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;
 import com.kingsrook.qqq.backend.core.model.actions.tables.count.CountOutput;
-import com.kingsrook.qqq.backend.core.model.actions.tables.query.QQueryFilter;
 import com.kingsrook.qqq.backend.core.model.metadata.QBackendMetaData;
 import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
 import com.kingsrook.qqq.backend.core.model.querystats.QueryStat;
@@ -83,22 +82,6 @@ public class CountAction
 
 
 
-   /*******************************************************************************
-    ** shorthand way to call for the most common use-case, when you just want the
-    ** count to be returned, and you just want to pass in a table name and filter.
-    *******************************************************************************/
-   public static Integer execute(String tableName, QQueryFilter filter) throws QException
-   {
-      CountAction countAction = new CountAction();
-      CountInput  countInput  = new CountInput();
-      countInput.setTableName(tableName);
-      countInput.setFilter(filter);
-      CountOutput countOutput = countAction.execute(countInput);
-      return (countOutput.getCount());
-   }
-
-
-
    /*******************************************************************************
     **
     *******************************************************************************/

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

@@ -238,11 +238,6 @@ public class GetAction
     *******************************************************************************/
    public static QRecord execute(String tableName, Serializable primaryKey) throws QException
    {
-      if(primaryKey instanceof QQueryFilter)
-      {
-         LOG.warn("Unexpected use of QQueryFilter instead of primary key in GetAction call");
-      }
-
       GetAction getAction = new GetAction();
       GetInput  getInput  = new GetInput(tableName).withPrimaryKey(primaryKey);
       return getAction.executeForRecord(getInput);

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 insert 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,7 +225,7 @@ 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()))
       {
@@ -244,10 +237,12 @@ public class InsertAction extends AbstractQActionFunction<InsertInput, InsertOut
       ///////////////////////////////////////////////////////////////////
       // 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());
 
@@ -263,7 +258,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

@@ -26,7 +26,6 @@ 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;
@@ -51,10 +50,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 +64,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 +101,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;
@@ -164,125 +158,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.

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();
 
       //////////////////////////////////////////////////////
@@ -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/ConvertHtmlToPdfAction.java

@@ -26,32 +26,22 @@ import java.nio.file.Path;
 import java.util.Map;
 import com.kingsrook.qqq.backend.core.actions.AbstractQActionFunction;
 import com.kingsrook.qqq.backend.core.exceptions.QException;
-import com.kingsrook.qqq.backend.core.logging.QLogger;
 import com.kingsrook.qqq.backend.core.model.actions.templates.ConvertHtmlToPdfInput;
 import com.kingsrook.qqq.backend.core.model.actions.templates.ConvertHtmlToPdfOutput;
 import com.kingsrook.qqq.backend.core.utils.CollectionUtils;
-import com.openhtmltopdf.css.constants.IdentValue;
-import com.openhtmltopdf.pdfboxout.PdfBoxFontResolver;
-import com.openhtmltopdf.pdfboxout.PdfBoxRenderer;
-import com.openhtmltopdf.pdfboxout.PdfRendererBuilder;
 import org.jsoup.Jsoup;
-import org.jsoup.helper.W3CDom;
 import org.jsoup.nodes.Document;
+import org.xhtmlrenderer.layout.SharedContext;
+import org.xhtmlrenderer.pdf.ITextRenderer;
 
 
 /*******************************************************************************
  ** Action to convert a string of HTML to a PDF!
  **
  ** Much credit to https://www.baeldung.com/java-html-to-pdf
- **
- ** Updated in March 2025 to go from flying-saucer-pdf-openpdf lib to openhtmltopdf,
- ** mostly to get support for max-height on images...
- ********************************************************************************/
+ *******************************************************************************/
 public class ConvertHtmlToPdfAction extends AbstractQActionFunction<ConvertHtmlToPdfInput, ConvertHtmlToPdfOutput>
 {
-   private static final QLogger LOG = QLogger.getLogger(ConvertHtmlToPdfAction.class);
-
-
 
    /*******************************************************************************
     **
@@ -68,37 +58,35 @@ public class ConvertHtmlToPdfAction extends AbstractQActionFunction<ConvertHtmlT
          //////////////////////////////////////////////////////////////////
          Document document = Jsoup.parse(input.getHtml());
          document.outputSettings().syntax(Document.OutputSettings.Syntax.xml);
-         org.w3c.dom.Document w3cDoc = new W3CDom().fromJsoup(document);
 
          //////////////////////////////
          // convert the XHTML to PDF //
          //////////////////////////////
-         PdfRendererBuilder builder = new PdfRendererBuilder();
-         builder.toStream(input.getOutputStream());
-         builder.useFastMode();
-         builder.withW3cDocument(w3cDoc, input.getBasePath() == null ? "./" : input.getBasePath().toUri().toString());
+         ITextRenderer renderer      = new ITextRenderer();
+         SharedContext sharedContext = renderer.getSharedContext();
+         sharedContext.setPrint(true);
+         sharedContext.setInteractive(false);
 
-         try(PdfBoxRenderer pdfBoxRenderer = builder.buildPdfRenderer())
+         if(input.getBasePath() != null)
          {
-            pdfBoxRenderer.layout();
-            pdfBoxRenderer.getSharedContext().setPrint(true);
-            pdfBoxRenderer.getSharedContext().setInteractive(false);
-
-            for(Map.Entry<String, Path> entry : CollectionUtils.nonNullMap(input.getCustomFonts()).entrySet())
-            {
-               LOG.warn("Note:  Custom fonts appear to not be working in this class at this time...");
-               pdfBoxRenderer.getFontResolver().addFont(
-                  entry.getValue().toAbsolutePath().toFile(), // Path to the TrueType font file
-                  entry.getKey(),                             // Font family name to use in CSS
-                  400,                                        // Font weight (e.g., 400 for normal, 700 for bold)
-                  IdentValue.NORMAL,                          // Font style (e.g., NORMAL, ITALIC)
-                  true,                                       // Whether to subset the font
-                  PdfBoxFontResolver.FontGroup.MAIN           // ??
-               );
-            }
-
-            pdfBoxRenderer.createPDF();
+            String baseUrl = input.getBasePath().toUri().toURL().toString();
+            renderer.setDocumentFromString(document.html(), baseUrl);
          }
+         else
+         {
+            renderer.setDocumentFromString(document.html());
+         }
+
+         //////////////////////////////////////////////////
+         // register any custom fonts the input supplied //
+         //////////////////////////////////////////////////
+         for(Map.Entry<String, Path> entry : CollectionUtils.nonNullMap(input.getCustomFonts()).entrySet())
+         {
+            renderer.getFontResolver().addFont(entry.getValue().toAbsolutePath().toString(), entry.getKey(), "UTF-8", true, null);
+         }
+
+         renderer.layout();
+         renderer.createPDF(input.getOutputStream());
 
          return (output);
       }

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/BasicCustomPossibleValueProvider.java

@@ -1,91 +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.actions.values;
-
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import com.kingsrook.qqq.backend.core.exceptions.QException;
-import com.kingsrook.qqq.backend.core.model.actions.values.SearchPossibleValueSourceInput;
-import com.kingsrook.qqq.backend.core.model.metadata.possiblevalues.QPossibleValue;
-
-
-/*******************************************************************************
- ** Basic implementation of a possible value provider, for where there's a limited
- ** set of possible source objects - so you just have to define how to make one
- ** PV from a source object, how to list all of the source objects, and how to
- ** look up a PV from an id.
- *******************************************************************************/
-public abstract class BasicCustomPossibleValueProvider<S, ID extends Serializable> implements QCustomPossibleValueProvider<ID>
-{
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   protected abstract QPossibleValue<ID> makePossibleValue(S sourceObject);
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   protected abstract S getSourceObject(Serializable id);
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   protected abstract List<S> getAllSourceObjects();
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   @Override
-   public QPossibleValue<ID> getPossibleValue(Serializable idValue)
-   {
-      S sourceObject = getSourceObject(idValue);
-      if(sourceObject == null)
-      {
-         return (null);
-      }
-
-      return makePossibleValue(sourceObject);
-   }
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   @Override
-   public List<QPossibleValue<ID>> search(SearchPossibleValueSourceInput input) throws QException
-   {
-      List<QPossibleValue<ID>> allPossibleValues = new ArrayList<>();
-      List<S>                  allSourceObjects  = getAllSourceObjects();
-      for(S sourceObject : allSourceObjects)
-      {
-         allPossibleValues.add(makePossibleValue(sourceObject));
-      }
-
-      return completeCustomPVSSearch(input, allPossibleValues);
-   }
-}

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

@@ -24,7 +24,6 @@ package com.kingsrook.qqq.backend.core.actions.values;
 
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
 import com.kingsrook.qqq.backend.core.exceptions.QException;
 import com.kingsrook.qqq.backend.core.model.actions.values.SearchPossibleValueSourceInput;
@@ -75,31 +74,6 @@ public interface QCustomPossibleValueProvider<T extends Serializable>
    }
 
 
-   /***************************************************************************
-    ** meant to be protected (but interface...) - for a custom PVS implementation
-    ** to complete its search (e.g., after it generates the list of PVS objects,
-    ** let this method do the filtering).
-    ***************************************************************************/
-   default List<QPossibleValue<T>> completeCustomPVSSearch(SearchPossibleValueSourceInput input, List<QPossibleValue<T>> possibleValues)
-   {
-      SearchPossibleValueSourceAction.PreparedSearchPossibleValueSourceInput preparedInput = SearchPossibleValueSourceAction.prepareSearchPossibleValueSourceInput(input);
-
-      List<QPossibleValue<T>> rs = new ArrayList<>();
-
-      for(QPossibleValue<T> possibleValue : possibleValues)
-      {
-         if(possibleValue != null && SearchPossibleValueSourceAction.doesPossibleValueMatchSearchInput(possibleValue, preparedInput))
-         {
-            rs.add(possibleValue);
-         }
-      }
-
-      rs.sort(Comparator.nullsLast(Comparator.comparing((QPossibleValue<T> pv) -> pv.getLabel())));
-
-      return (rs);
-   }
-
-
    /*******************************************************************************
     **
     *******************************************************************************/

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

@@ -341,7 +341,7 @@ public class QPossibleValueTranslator
 
       try
       {
-         QCustomPossibleValueProvider<?> customPossibleValueProvider = QCodeLoader.getAdHoc(QCustomPossibleValueProvider.class, possibleValueSource.getCustomCodeReference());
+         QCustomPossibleValueProvider customPossibleValueProvider = QCodeLoader.getCustomPossibleValueProvider(possibleValueSource);
          return (formatPossibleValue(possibleValueSource, customPossibleValueProvider.getPossibleValue(value)));
       }
       catch(Exception e)

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

@@ -45,7 +45,6 @@ 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 org.apache.commons.lang3.BooleanUtils;
 import static com.kingsrook.qqq.backend.core.logging.LogUtils.logPair;
 
 
@@ -469,8 +468,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:                                                                                            //
@@ -480,14 +478,25 @@ 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));
             String defaultExtension = ValueUtils.getValueAsString(adornmentValues.get(AdornmentType.FileDownloadValues.DEFAULT_EXTENSION));
 
-            Boolean downloadUrlDynamic = ValueUtils.getValueAsBoolean(adornmentValues.get(AdornmentType.FileDownloadValues.DOWNLOAD_URL_DYNAMIC));
-
             for(QRecord record : records)
             {
                if(!doesFieldHaveValue(field, record))
@@ -495,11 +504,6 @@ public class QValueFormatter
                   continue;
                }
 
-               if(BooleanUtils.isTrue(downloadUrlDynamic))
-               {
-                  continue;
-               }
-
                Serializable primaryKey = record.getValue(table.getPrimaryKeyField());
                String       fileName   = null;
 
@@ -517,7 +521,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);
                   }
                }
@@ -538,19 +542,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(), AdornmentType.FileDownloadValues.makeFieldDownloadUrl(table.getName(), primaryKey, field.getName(), fileName));
-               }
+               record.setValue(field.getName(), "/data/" + table.getName() + "/" + primaryKey + "/" + field.getName() + "/" + fileName);
                record.setDisplayValue(field.getName(), fileName);
             }
          }

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

@@ -26,13 +26,8 @@ import java.io.Serializable;
 import java.time.Instant;
 import java.time.LocalDate;
 import java.util.ArrayList;
-import java.util.Collection;
-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;
@@ -52,9 +47,10 @@ import com.kingsrook.qqq.backend.core.model.metadata.possiblevalues.QPossibleVal
 import com.kingsrook.qqq.backend.core.model.metadata.possiblevalues.QPossibleValueSource;
 import com.kingsrook.qqq.backend.core.model.metadata.possiblevalues.QPossibleValueSourceType;
 import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData;
+import com.kingsrook.qqq.backend.core.utils.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 +61,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;
 
 
@@ -108,54 +101,47 @@ public class SearchPossibleValueSourceAction
 
 
 
-   /***************************************************************************
-    ** record to store "computed" values as part of a possible-value search -
-    ** e.g., ids type-convered, and lower-cased labels.
-    ***************************************************************************/
-   public record PreparedSearchPossibleValueSourceInput(Collection<?> inputIdsAsCorrectType, Collection<String> lowerCaseLabels, String searchTerm) {}
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   public static PreparedSearchPossibleValueSourceInput prepareSearchPossibleValueSourceInput(SearchPossibleValueSourceInput input)
-   {
-      QPossibleValueSource possibleValueSource   = QContext.getQInstance().getPossibleValueSource(input.getPossibleValueSourceName());
-      List<?>              inputIdsAsCorrectType = convertInputIdsToPossibleValueSourceIdType(possibleValueSource, input.getIdList());
-
-      Set<String> lowerCaseLabels = null;
-      if(input.getLabelList() != null)
-      {
-         lowerCaseLabels = input.getLabelList().stream()
-            .filter(Objects::nonNull)
-            .map(l -> l.toLowerCase())
-            .collect(Collectors.toSet());
-      }
-
-      return (new PreparedSearchPossibleValueSourceInput(inputIdsAsCorrectType, lowerCaseLabels, input.getSearchTerm()));
-   }
-
-
-
    /*******************************************************************************
     **
     *******************************************************************************/
    private SearchPossibleValueSourceOutput searchPossibleValueEnum(SearchPossibleValueSourceInput input, QPossibleValueSource possibleValueSource)
    {
-      PreparedSearchPossibleValueSourceInput preparedSearchPossibleValueSourceInput = prepareSearchPossibleValueSourceInput(input);
-
       SearchPossibleValueSourceOutput output      = new SearchPossibleValueSourceOutput();
       List<Serializable>              matchingIds = new ArrayList<>();
 
+      List<?> inputIdsAsCorrectType = convertInputIdsToEnumIdType(possibleValueSource, input.getIdList());
+
       for(QPossibleValue<?> possibleValue : possibleValueSource.getEnumValues())
       {
-         boolean match = doesPossibleValueMatchSearchInput(possibleValue, preparedSearchPossibleValueSourceInput);
+         boolean match = false;
+
+         if(input.getIdList() != null)
+         {
+            if(inputIdsAsCorrectType.contains(possibleValue.getId()))
+            {
+               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()));
+            }
+            else
+            {
+               match = true;
+            }
+         }
 
          if(match)
          {
-            matchingIds.add(possibleValue.getId());
+            matchingIds.add((Serializable) possibleValue.getId());
          }
+
+         // todo - skip & limit?
+         // todo - default filter
       }
 
       List<QPossibleValue<?>> qPossibleValues = possibleValueTranslator.buildTranslatedPossibleValueList(possibleValueSource, matchingIds);
@@ -166,95 +152,37 @@ public class SearchPossibleValueSourceAction
 
 
 
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   public static boolean doesPossibleValueMatchSearchInput(QPossibleValue<?> possibleValue, PreparedSearchPossibleValueSourceInput input)
-   {
-      boolean match = false;
-
-      if(input.inputIdsAsCorrectType() != null)
-      {
-         if(input.inputIdsAsCorrectType().contains(possibleValue.getId()))
-         {
-            match = true;
-         }
-      }
-      else if(input.lowerCaseLabels() != null)
-      {
-         if(input.lowerCaseLabels().contains(possibleValue.getLabel().toLowerCase()))
-         {
-            match = true;
-         }
-      }
-      else
-      {
-         if(StringUtils.hasContent(input.searchTerm()))
-         {
-            match = (Objects.equals(ValueUtils.getValueAsString(possibleValue.getId()).toLowerCase(), input.searchTerm().toLowerCase())
-               || possibleValue.getLabel().toLowerCase().startsWith(input.searchTerm().toLowerCase()));
-         }
-         else
-         {
-            match = true;
-         }
-      }
-      return match;
-   }
-
-
-
    /*******************************************************************************
     ** The input list of ids might come through as a type that isn't the same as
     ** the type of the ids in the enum (e.g., strings from a frontend, integers
-    ** in an enum).  So, this method type-converts them.
+    ** in an enum).  So, this method looks at the first id in the enum, and then
+    ** maps all the inputIds to be of the same type.
     *******************************************************************************/
-   private static List<Object> convertInputIdsToPossibleValueSourceIdType(QPossibleValueSource possibleValueSource, List<Serializable> inputIdList)
+   private List<Object> convertInputIdsToEnumIdType(QPossibleValueSource possibleValueSource, List<Serializable> inputIdList)
    {
       List<Object> rs = new ArrayList<>();
-
-      if(inputIdList == null)
-      {
-         return (null);
-      }
-      else if(inputIdList.isEmpty())
+      if(CollectionUtils.nullSafeIsEmpty(inputIdList))
       {
          return (rs);
       }
 
-      QFieldType type = possibleValueSource.getIdType();
+      Object anIdFromTheEnum = possibleValueSource.getEnumValues().get(0).getId();
 
-      for(Serializable inputId : inputIdList)
+      if(anIdFromTheEnum instanceof Integer)
       {
-         Object properlyTypedId = null;
-         try
-         {
-            if(type.equals(QFieldType.INTEGER))
-            {
-               properlyTypedId = ValueUtils.getValueAsInteger(inputId);
-            }
-            else if(type.isStringLike())
-            {
-               properlyTypedId = ValueUtils.getValueAsString(inputId);
-            }
-            else if(type.equals(QFieldType.BOOLEAN))
-            {
-               properlyTypedId = ValueUtils.getValueAsBoolean(inputId);
-            }
-            else
-            {
-               LOG.warn("Unexpected type [" + type + "] 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);
@@ -281,53 +209,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();
@@ -379,6 +260,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 //
       ///////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -388,9 +272,6 @@ public class SearchPossibleValueSourceAction
          queryFilter = input.getDefaultQueryFilter();
       }
 
-      queryFilter.setLimit(input.getLimit());
-      queryFilter.setSkip(input.getSkip());
-
       queryFilter.setOrderBys(possibleValueSource.getOrderByFields());
 
       queryInput.setFilter(queryFilter);
@@ -407,7 +288,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);
 
@@ -420,11 +301,11 @@ public class SearchPossibleValueSourceAction
     **
     *******************************************************************************/
    @SuppressWarnings({ "rawtypes", "unchecked" })
-   private SearchPossibleValueSourceOutput searchPossibleValueCustom(SearchPossibleValueSourceInput input, QPossibleValueSource possibleValueSource) throws QException
+   private SearchPossibleValueSourceOutput searchPossibleValueCustom(SearchPossibleValueSourceInput input, QPossibleValueSource possibleValueSource)
    {
       try
       {
-         QCustomPossibleValueProvider customPossibleValueProvider = QCodeLoader.getAdHoc(QCustomPossibleValueProvider.class, possibleValueSource.getCustomCodeReference());
+         QCustomPossibleValueProvider customPossibleValueProvider = QCodeLoader.getCustomPossibleValueProvider(possibleValueSource);
          List<QPossibleValue<?>>      possibleValues              = customPossibleValueProvider.search(input);
 
          SearchPossibleValueSourceOutput output = new SearchPossibleValueSourceOutput();
@@ -433,10 +314,11 @@ public class SearchPossibleValueSourceAction
       }
       catch(Exception e)
       {
-         String message = "Error searching custom possible value source [" + input.getPossibleValueSourceName() + "]";
-         LOG.warn(message, e);
-         throw (new QException(message, e));
+         // 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/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,20 +74,13 @@ 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;
 import com.kingsrook.qqq.backend.core.scheduler.QScheduleManager;
-import com.kingsrook.qqq.backend.core.utils.ClassPathUtils;
 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;
 
 
 /*******************************************************************************
@@ -125,8 +106,6 @@ public class QInstanceEnricher
    //////////////////////////////////////////////////////////////////////////////////////////////////
    private static final Map<String, String> labelMappings = new LinkedHashMap<>();
 
-   private static ListingHash<Class<?>, QInstanceEnricherPluginInterface<?>> enricherPlugins = new ListingHash<>();
-
 
 
    /*******************************************************************************
@@ -188,7 +167,6 @@ public class QInstanceEnricher
       }
 
       enrichJoins();
-      enrichInstance();
 
       //////////////////////////////////////////////////////////////////////////////
       // if the instance DOES have 1 or more scheduler, but no schedulable types, //
@@ -205,16 +183,6 @@ public class QInstanceEnricher
 
 
 
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   private void enrichInstance()
-   {
-      runPlugins(QInstance.class, qInstance, qInstance);
-   }
-
-
-
    /*******************************************************************************
     **
     *******************************************************************************/
@@ -279,14 +247,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)
       {
@@ -302,7 +262,6 @@ public class QInstanceEnricher
    private void enrichWidget(QWidgetMetaDataInterface widgetMetaData)
    {
       enrichPermissionRules(widgetMetaData);
-      runPlugins(QWidgetMetaDataInterface.class, widgetMetaData, qInstance);
    }
 
 
@@ -313,7 +272,6 @@ public class QInstanceEnricher
    private void enrichBackend(QBackendMetaData qBackendMetaData)
    {
       qBackendMetaData.enrich();
-      runPlugins(QBackendMetaData.class, qBackendMetaData, qInstance);
    }
 
 
@@ -354,7 +312,6 @@ public class QInstanceEnricher
 
       enrichPermissionRules(table);
       enrichAuditRules(table);
-      runPlugins(QTableMetaData.class, table, qInstance);
    }
 
 
@@ -445,7 +402,6 @@ public class QInstanceEnricher
       }
 
       enrichPermissionRules(process);
-      runPlugins(QProcessMetaData.class, process, qInstance);
    }
 
 
@@ -454,27 +410,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);
@@ -495,13 +434,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);
-         }
-      }
    }
 
 
@@ -567,8 +499,6 @@ public class QInstanceEnricher
             field.withBehavior(DynamicDefaultValueBehavior.MODIFY_DATE);
          }
       }
-
-      runPlugins(QFieldMetaData.class, field, qInstance);
    }
 
 
@@ -640,7 +570,6 @@ public class QInstanceEnricher
       ensureAppSectionMembersAreAppChildren(app);
 
       enrichPermissionRules(app);
-      runPlugins(QAppMetaData.class, app, qInstance);
    }
 
 
@@ -788,7 +717,6 @@ public class QInstanceEnricher
       }
 
       enrichPermissionRules(report);
-      runPlugins(QReportMetaData.class, report, qInstance);
    }
 
 
@@ -880,7 +808,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());
@@ -892,7 +820,6 @@ public class QInstanceEnricher
             values
          )
          .withName(processName)
-         .withIcon(new QIcon().withName("library_add"))
          .withLabel(table.getLabel() + " Bulk Insert")
          .withTableName(table.getName())
          .withIsHidden(true)
@@ -923,76 +850,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);
    }
 
@@ -1387,137 +1256,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.getAdHoc(QCustomPossibleValueProvider.class, possibleValueSource.getCustomCodeReference());
-
-               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();
-   }
-
-
-
-   /***************************************************************************
-    ** scan the classpath for classes in the specified package name which
-    ** implement the QInstanceEnricherPluginInterface - any found get added
-    ***************************************************************************/
-   public static void discoverAndAddPluginsInPackage(String packageName) throws QException
-   {
-      try
-      {
-         for(Class<?> aClass : ClassPathUtils.getClassesInPackage(packageName))
-         {
-            if(QInstanceEnricherPluginInterface.class.isAssignableFrom(aClass))
-            {
-               QInstanceEnricherPluginInterface<?> plugin = (QInstanceEnricherPluginInterface<?>) aClass.getConstructor().newInstance();
-               addEnricherPlugin(plugin);
-            }
-         }
-      }
-      catch(Exception e)
-      {
-         throw (new QException("Error discovering and adding enricher plugins in package [" + packageName + "]", e));
-      }
-   }
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   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/QInstanceValidator.java

@@ -37,18 +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.MetaDataActionCustomizerInterface;
-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;
@@ -73,13 +68,11 @@ 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;
@@ -111,16 +104,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;
 
@@ -143,8 +132,6 @@ public class QInstanceValidator
 
    private static ListingHash<Class<?>, QInstanceValidatorPluginInterface<?>> validatorPlugins = new ListingHash<>();
 
-   private JoinGraph joinGraph = null;
-
    private List<String> errors = new ArrayList<>();
 
 
@@ -172,7 +159,8 @@ public class QInstanceValidator
       // 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. //
       /////////////////////////////////////////////////////////////////////////////////////////////////////
-      long start = System.currentTimeMillis();
+      JoinGraph joinGraph = null;
+      long      start     = System.currentTimeMillis();
       try
       {
          /////////////////////////////////////////////////////////////////////////////////////////////////
@@ -181,7 +169,7 @@ public class QInstanceValidator
          // TODO - possible point of customization (use a different enricher, or none, or pass it options).
          QInstanceEnricher qInstanceEnricher = new QInstanceEnricher(qInstance);
          qInstanceEnricher.enrich();
-         this.joinGraph = qInstanceEnricher.getJoinGraph();
+         joinGraph = qInstanceEnricher.getJoinGraph();
       }
       catch(Exception e)
       {
@@ -196,7 +184,6 @@ public class QInstanceValidator
       //////////////////////////////////////////////////////////////////////////
       try
       {
-         validateInstanceAttributes(qInstance);
          validateBackends(qInstance);
          validateAuthentication(qInstance);
          validateAutomationProviders(qInstance);
@@ -237,24 +224,6 @@ public class QInstanceValidator
 
 
 
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   private void validateInstanceAttributes(QInstance qInstance)
-   {
-      if(qInstance.getMetaDataFilter() != null)
-      {
-         validateSimpleCodeReference("Instance metaDataFilter ", qInstance.getMetaDataFilter(), MetaDataFilterInterface.class);
-      }
-
-      if(qInstance.getMetaDataActionCustomizer() != null)
-      {
-         validateSimpleCodeReference("Instance metaDataActionCustomizer ", qInstance.getMetaDataActionCustomizer(), MetaDataActionCustomizerInterface.class);
-      }
-   }
-
-
-
    /*******************************************************************************
     **
     *******************************************************************************/
@@ -386,8 +355,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()))
          {
@@ -556,60 +525,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);
@@ -644,7 +559,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)
          {
@@ -847,38 +762,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);
             }
          }
       }
@@ -1035,8 +927,13 @@ public class QInstanceValidator
       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 //
@@ -1055,15 +952,7 @@ public class QInstanceValidator
             @SuppressWarnings("unchecked")
             Class<FieldBehavior<?>> behaviorClass = (Class<FieldBehavior<?>>) 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())
             {
@@ -1149,31 +1038,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());
-         }
-      }
-   }
-
-
-
    /*******************************************************************************
     **
     *******************************************************************************/
@@ -1423,7 +1287,7 @@ public class QInstanceValidator
                ////////////////////////////////////////////////////////////////////////
                if(customizerInstance != null && tableCustomizer.getExpectedType() != null)
                {
-                  assertObjectCanBeCasted(prefix, customizerInstance, tableCustomizer.getExpectedType());
+                  assertObjectCanBeCasted(prefix, tableCustomizer.getExpectedType(), customizerInstance);
                }
             }
          }
@@ -1435,31 +1299,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;
    }
 
 
@@ -1694,16 +1545,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))
@@ -1819,12 +1660,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)
@@ -1833,21 +1671,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.");
                }
             }
 
@@ -1912,7 +1743,7 @@ public class QInstanceValidator
    /*******************************************************************************
     **
     *******************************************************************************/
-   public void validateQueryFilter(QInstance qInstance, String context, QTableMetaData table, QQueryFilter queryFilter, List<QueryJoin> queryJoins)
+   private void validateQueryFilter(QInstance qInstance, String context, QTableMetaData table, QQueryFilter queryFilter, List<QueryJoin> queryJoins)
    {
       for(QFilterCriteria criterion : CollectionUtils.nonNullList(queryFilter.getCriteria()))
       {
@@ -1956,8 +1787,7 @@ public class QInstanceValidator
       {
          if(fieldName.contains("."))
          {
-            String fieldNameAfterDot  = fieldName.substring(fieldName.lastIndexOf(".") + 1);
-            String tableNameBeforeDot = fieldName.substring(0, fieldName.lastIndexOf("."));
+            String fieldNameAfterDot = fieldName.substring(fieldName.lastIndexOf(".") + 1);
 
             if(CollectionUtils.nullSafeHasContents(queryJoins))
             {
@@ -1981,32 +1811,11 @@ public class QInstanceValidator
             }
             else
             {
-               if(this.joinGraph != null)
-               {
-                  Set<JoinGraph.JoinConnectionList> joinConnections = joinGraph.getJoinConnections(table.getName());
-                  for(JoinGraph.JoinConnectionList joinConnectionList : joinConnections)
-                  {
-                     JoinGraph.JoinConnection joinConnection = joinConnectionList.list().get(joinConnectionList.list().size() - 1);
-                     if(tableNameBeforeDot.equals(joinConnection.joinTable()))
-                     {
-                        QTableMetaData joinTable = qInstance.getTable(tableNameBeforeDot);
-                        if(joinTable.getFields().containsKey(fieldNameAfterDot))
-                        {
-                           /////////////////////////
-                           // mmm, looks valid... //
-                           /////////////////////////
-                           return (true);
-                        }
-                     }
-                  }
-               }
-
-               //////////////////////////////////////////////////////////////////////////////////////
-               // todo - not sure how vulnerable we are to ongoing issues here...                  //
-               // idea:  let a filter (or any object?) be opted out of validation, some version of //
-               // a static map of objects we can check at the top of various validate methods...   //
-               //////////////////////////////////////////////////////////////////////////////////////
-               errors.add("Failed to find field named: " + fieldName);
+               errors.add("QInstanceValidator does not yet support finding a field that looks like a join field, but isn't associated with a query.");
+               return (true);
+               // todo! for(QJoinMetaData join : CollectionUtils.nonNullMap(qInstance.getJoins()).values())
+               // {
+               // }
             }
          }
       }
@@ -2110,11 +1919,6 @@ public class QInstanceValidator
                   }
                }
 
-               if(widget.getValidatorPlugin() != null)
-               {
-                  widget.getValidatorPlugin().validate(widget, qInstance, this);
-               }
-
                runPlugins(QWidgetMetaDataInterface.class, widget, qInstance);
             }
          );
@@ -2133,100 +1937,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))
       {
@@ -2254,7 +2045,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/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/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
@@ -73,23 +75,4 @@ public interface MetaDataProducerInterface<T extends MetaDataProducerOutput>
       return (true);
    }
 
-
-   /***************************************************************************
-    *
-    ***************************************************************************/
-   default void setSourceClass(Class<?> sourceClass)
-   {
-      //////////
-      // noop //
-      //////////
-   }
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   default Class<?> getSourceClass()
-   {
-      return null;
-   }
 }

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,28 +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.QProcessMetaData;
 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;
 
 
 /*******************************************************************************
@@ -55,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;
@@ -66,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 //
    ////////////////////////////////////////////////////////////////////////////
 
 
+
    /*******************************************************************************
     **
     *******************************************************************************/
@@ -108,7 +96,6 @@ public class RunBackendStepInput extends AbstractActionInput
       target.setAsyncJobCallback(getAsyncJobCallback());
       target.setFrontendStepBehavior(getFrontendStepBehavior());
       target.setValues(getValues());
-      target.setProcessTracer(getProcessTracer().orElse(null));
    }
 
 
@@ -251,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
     **
@@ -452,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
@@ -568,64 +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));
-         }
-      }
-   }
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   public QProcessMetaData getProcess()
-   {
-      return (QContext.getQInstance().getProcess(getProcessName()));
-   }
 }

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/reporting/ReportInput.java

@@ -28,7 +28,6 @@ import java.util.Map;
 import java.util.function.Supplier;
 import com.kingsrook.qqq.backend.core.actions.reporting.ExportStreamerInterface;
 import com.kingsrook.qqq.backend.core.model.actions.AbstractTableActionInput;
-import com.kingsrook.qqq.backend.core.model.metadata.code.QCodeReference;
 import com.kingsrook.qqq.backend.core.model.metadata.reporting.QReportMetaData;
 
 
@@ -45,7 +44,6 @@ public class ReportInput extends AbstractTableActionInput
    private ReportDestination reportDestination;
 
    private Supplier<? extends ExportStreamerInterface> overrideExportStreamerSupplier;
-   private QCodeReference                              exportStyleCustomizer;
 
 
 
@@ -210,35 +208,4 @@ public class ReportInput extends AbstractTableActionInput
       return (this);
    }
 
-
-
-   /*******************************************************************************
-    ** Getter for exportStyleCustomizer
-    *******************************************************************************/
-   public QCodeReference getExportStyleCustomizer()
-   {
-      return (this.exportStyleCustomizer);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for exportStyleCustomizer
-    *******************************************************************************/
-   public void setExportStyleCustomizer(QCodeReference exportStyleCustomizer)
-   {
-      this.exportStyleCustomizer = exportStyleCustomizer;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for exportStyleCustomizer
-    *******************************************************************************/
-   public ReportInput withExportStyleCustomizer(QCodeReference exportStyleCustomizer)
-   {
-      this.exportStyleCustomizer = exportStyleCustomizer;
-      return (this);
-   }
-
 }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/CriteriaMissingInputValueBehavior.java

@@ -1,66 +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.tables.query;
-
-
-/***************************************************************************
- ** Possible behaviors for doing interpretValues on a filter, and a criteria
- ** has a variable value (either as a string-that-looks-like-a-variable,
- ** as in ${input.foreignId} for a PVS filter, or a FilterVariableExpression),
- ** and a value for that variable isn't available.
- **
- ** Used in conjunction with FilterUseCase and its implementations, e.g.,
- ** PossibleValueSearchFilterUseCase.
- ***************************************************************************/
-public enum CriteriaMissingInputValueBehavior
-{
-   //////////////////////////////////////////////////////////////////////
-   // this was the original behavior, before we added this enum.  but, //
-   // it doesn't ever seem entirely valid, and isn't currently used.   //
-   //////////////////////////////////////////////////////////////////////
-   INTERPRET_AS_NULL_VALUE,
-
-   //////////////////////////////////////////////////////////////////////////
-   // make the criteria behave as though it's not in the filter at all.    //
-   // effectively by changing its operator to TRUE, so it always matches.  //
-   // original intended use is for possible-values on  query screens,      //
-   // where a foreign-id isn't present, so we want to show all PV options. //
-   //////////////////////////////////////////////////////////////////////////
-   REMOVE_FROM_FILTER,
-
-   //////////////////////////////////////////////////////////////////////////////////////
-   // make the criteria such that it makes no rows ever match.                         //
-   // e.g., changes it to a FALSE.  I suppose, within an OR, that might                //
-   // not be powerful enough...  but, it solves the immediate use-case in              //
-   // front of us, which is forms, where a PV field should show no values              //
-   // until a foreign key field has a value.                                           //
-   // Note that this use-case used to have the same end-effect by such                 //
-   // variables being interpreted as nulls - but this approach feels more intentional. //
-   //////////////////////////////////////////////////////////////////////////////////////
-   MAKE_NO_MATCHES,
-
-   ///////////////////////////////////////////////////////////////////////////////////////////
-   // throw an exception if a value isn't available.  This is the overall default,          //
-   // and originally was what we did for FilterVariableExpressions, e.g., for saved reports //
-   ///////////////////////////////////////////////////////////////////////////////////////////
-   THROW_EXCEPTION
-}

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/CriteriaOption.java

@@ -1,31 +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.model.actions.tables.query;
-
-
-/*******************************************************************************
- **
- *******************************************************************************/
-public enum CriteriaOption implements CriteriaOptionInterface
-{
-   CASE_INSENSITIVE;
-}

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/CriteriaOptionInterface.java

@@ -1,30 +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.model.actions.tables.query;
-
-
-/*******************************************************************************
- **
- *******************************************************************************/
-public interface CriteriaOptionInterface
-{
-}

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/FilterUseCase.java

@@ -1,58 +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.tables.query;
-
-
-/*******************************************************************************
- ** Interface where we can associate behaviors with various use cases for
- ** QQueryFilters - the original being, how to handle (in the interpretValues
- ** method) how to handle missing input values.
- **
- ** Includes a default implementation, with a default behavior - which is to
- ** throw an exception upon missing criteria variable values.
- *******************************************************************************/
-public interface FilterUseCase
-{
-   FilterUseCase DEFAULT = new DefaultFilterUseCase();
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   CriteriaMissingInputValueBehavior getDefaultCriteriaMissingInputValueBehavior();
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   class DefaultFilterUseCase implements FilterUseCase
-   {
-
-      /***************************************************************************
-       **
-       ***************************************************************************/
-      @Override
-      public CriteriaMissingInputValueBehavior getDefaultCriteriaMissingInputValueBehavior()
-      {
-         return CriteriaMissingInputValueBehavior.THROW_EXCEPTION;
-      }
-   }
-}

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/JoinsContext.java

@@ -82,7 +82,7 @@ public class JoinsContext
    /////////////////////////////////////////////////////////////////////////////
    // we will get a TON of more output if this gets turned up, so be cautious //
    /////////////////////////////////////////////////////////////////////////////
-   private Level logLevel          = Level.OFF;
+   private Level logLevel = Level.OFF;
    private Level logLevelForFilter = Level.OFF;
 
 
@@ -404,12 +404,6 @@ public class JoinsContext
                chainIsInner = false;
             }
 
-            if(hasAllAccessKey(recordSecurityLock))
-            {
-               queryJoin.withType(QueryJoin.Type.LEFT);
-               chainIsInner = false;
-            }
-
             addQueryJoin(queryJoin, "forRecordSecurityLock (non-flipped)", "- ");
             addedQueryJoins.add(queryJoin);
             tmpTable = instance.getTable(join.getRightTable());
@@ -429,12 +423,6 @@ public class JoinsContext
                chainIsInner = false;
             }
 
-            if(hasAllAccessKey(recordSecurityLock))
-            {
-               queryJoin.withType(QueryJoin.Type.LEFT);
-               chainIsInner = false;
-            }
-
             addQueryJoin(queryJoin, "forRecordSecurityLock (flipped)", "- ");
             addedQueryJoins.add(queryJoin);
             tmpTable = instance.getTable(join.getLeftTable());
@@ -468,53 +456,44 @@ public class JoinsContext
 
 
 
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   private boolean hasAllAccessKey(RecordSecurityLock recordSecurityLock)
-   {
-      //////////////////////////////////////////////////////////////////////////////////////////////////////////////
-      // check if the key type has an all-access key, and if so, if it's set to true for the current user/session //
-      //////////////////////////////////////////////////////////////////////////////////////////////////////////////
-      QSecurityKeyType securityKeyType = instance.getSecurityKeyType(recordSecurityLock.getSecurityKeyType());
-      if(StringUtils.hasContent(securityKeyType.getAllAccessKeyName()))
-      {
-         QSession session = QContext.getQSession();
-         if(session.hasSecurityKeyValue(securityKeyType.getAllAccessKeyName(), true, QFieldType.BOOLEAN))
-         {
-            return (true);
-         }
-      }
-
-      return (false);
-   }
-
-
-
    /*******************************************************************************
     **
     *******************************************************************************/
    private void addSubFilterForRecordSecurityLock(RecordSecurityLock recordSecurityLock, QTableMetaData table, String tableNameOrAlias, boolean isOuter, QueryJoin sourceQueryJoin)
    {
-      boolean haveAllAccessKey = hasAllAccessKey(recordSecurityLock);
-      if(haveAllAccessKey)
-      {
-         if(sourceQueryJoin != null)
-         {
-            ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            // in case the queryJoin object is re-used between queries, and its security criteria need to be different (!!), reset it //
-            // this can be exposed in tests - maybe not entirely expected in real-world, but seems safe enough                        //
-            ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-            sourceQueryJoin.withSecurityCriteria(new ArrayList<>());
-         }
+      QSession session = QContext.getQSession();
 
-         ////////////////////////////////////////////////////////////////////////////////////////
-         // if we're in an AND filter, then we don't need a criteria for this lock, so return. //
-         ////////////////////////////////////////////////////////////////////////////////////////
-         boolean inAnAndFilter = securityFilterCursor.getBooleanOperator() == QQueryFilter.BooleanOperator.AND;
-         if(inAnAndFilter)
+      //////////////////////////////////////////////////////////////////////////////////////////////////////////////
+      // check if the key type has an all-access key, and if so, if it's set to true for the current user/session //
+      //////////////////////////////////////////////////////////////////////////////////////////////////////////////
+      QSecurityKeyType securityKeyType  = instance.getSecurityKeyType(recordSecurityLock.getSecurityKeyType());
+      boolean          haveAllAccessKey = false;
+      if(StringUtils.hasContent(securityKeyType.getAllAccessKeyName()))
+      {
+         //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+         // if we have all-access on this key, then we don't need a criterion for it (as long as we're in an AND filter) //
+         //////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+         if(session.hasSecurityKeyValue(securityKeyType.getAllAccessKeyName(), true, QFieldType.BOOLEAN))
          {
-            return;
+            haveAllAccessKey = true;
+
+            if(sourceQueryJoin != null)
+            {
+               ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+               // in case the queryJoin object is re-used between queries, and its security criteria need to be different (!!), reset it //
+               // this can be exposed in tests - maybe not entirely expected in real-world, but seems safe enough                        //
+               ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+               sourceQueryJoin.withSecurityCriteria(new ArrayList<>());
+            }
+
+            ////////////////////////////////////////////////////////////////////////////////////////
+            // if we're in an AND filter, then we don't need a criteria for this lock, so return. //
+            ////////////////////////////////////////////////////////////////////////////////////////
+            boolean inAnAndFilter = securityFilterCursor.getBooleanOperator() == QQueryFilter.BooleanOperator.AND;
+            if(inAnAndFilter)
+            {
+               return;
+            }
          }
       }
 
@@ -566,7 +545,7 @@ public class JoinsContext
       }
       else
       {
-         List<Serializable> securityKeyValues = QContext.getQSession().getSecurityKeyValues(recordSecurityLock.getSecurityKeyType(), type);
+         List<Serializable> securityKeyValues = session.getSecurityKeyValues(recordSecurityLock.getSecurityKeyType(), type);
          if(CollectionUtils.nullSafeIsEmpty(securityKeyValues))
          {
             ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/QFilterCriteria.java

@@ -26,10 +26,8 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
-import java.util.Set;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.kingsrook.qqq.backend.core.logging.QLogger;
 import com.kingsrook.qqq.backend.core.model.actions.tables.query.serialization.QFilterCriteriaDeserializer;
@@ -46,7 +44,7 @@ public class QFilterCriteria implements Serializable, Cloneable
 {
    private static final QLogger LOG = QLogger.getLogger(QFilterCriteria.class);
 
-   private String             fieldName;
+   private String fieldName;
    private QCriteriaOperator  operator;
    private List<Serializable> values;
 
@@ -55,8 +53,6 @@ public class QFilterCriteria implements Serializable, Cloneable
    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
    private String otherFieldName;
 
-   private Set<CriteriaOptionInterface> options = null;
-
 
 
    /*******************************************************************************
@@ -73,13 +69,6 @@ public class QFilterCriteria implements Serializable, Cloneable
             clone.values = new ArrayList<>();
             clone.values.addAll(values);
          }
-
-         if(options != null)
-         {
-            clone.options = new HashSet<>();
-            clone.options.addAll(options);
-         }
-
          return clone;
       }
       catch(CloneNotSupportedException e)
@@ -396,78 +385,4 @@ public class QFilterCriteria implements Serializable, Cloneable
       return Objects.hash(fieldName, operator, values, otherFieldName);
    }
 
-
-
-   /*******************************************************************************
-    ** Getter for options
-    *******************************************************************************/
-   public Set<CriteriaOptionInterface> getOptions()
-   {
-      return (this.options);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for options
-    *******************************************************************************/
-   public void setOptions(Set<CriteriaOptionInterface> options)
-   {
-      this.options = options;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for options
-    *******************************************************************************/
-   public QFilterCriteria withOptions(Set<CriteriaOptionInterface> options)
-   {
-      this.options = options;
-      return (this);
-   }
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   public QFilterCriteria withOption(CriteriaOptionInterface option)
-   {
-      if(options == null)
-      {
-         options = new HashSet<>();
-      }
-      options.add(option);
-      return (this);
-   }
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   public QFilterCriteria withoutOption(CriteriaOptionInterface option)
-   {
-      if(options != null)
-      {
-         options.remove(option);
-      }
-      return (this);
-   }
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   public boolean hasOption(CriteriaOptionInterface option)
-   {
-      if(options == null)
-      {
-         return (false);
-      }
-
-      return (options.contains(option));
-   }
-
 }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/QQueryFilter.java

@@ -55,16 +55,6 @@ public class QQueryFilter implements Serializable, Cloneable
    private BooleanOperator    booleanOperator = BooleanOperator.AND;
    private List<QQueryFilter> subFilters      = new ArrayList<>();
 
-   //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-   // initial intent here was - put, e.g., UNION between multiple SELECT (with the individual selects being defined in subFilters) //
-   // but, actually SQL would let us do, e.g., SELECT UNION SELECT INTERSECT SELECT                                                //
-   // so - we could see a future implementation where we:                                                                          //
-   // - used the top-level subFilterSetOperator to indicate hat we are doing a multi-query set-operation query.                    //
-   // - looked within the subFilter, to see if it specified a subFilterSetOperator - and use that operator before that query       //
-   // but - in v0, just using the one at the top-level works                                                                       //
-   //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-   private SubFilterSetOperator subFilterSetOperator = null;
-
    ////////////////////////////////////////////////////////////////////////////////////////////////////////////
    // skip & limit are meant to only apply to QueryAction (at least at the initial time they are added here) //
    // e.g., they are ignored in CountAction, AggregateAction, etc, where their meanings may be less obvious  //
@@ -85,19 +75,6 @@ public class QQueryFilter implements Serializable, Cloneable
 
 
 
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   public enum SubFilterSetOperator
-   {
-      UNION,
-      UNION_ALL,
-      INTERSECT,
-      EXCEPT
-   }
-
-
-
    /*******************************************************************************
     ** Constructor
     **
@@ -551,27 +528,8 @@ public class QQueryFilter implements Serializable, Cloneable
     ** Note - it may be very important that you call this method on a clone of a
     ** QQueryFilter - e.g., if it's one that defined in metaData, and that we don't
     ** want to be (permanently) changed!!
-    **
-    ** This overload does not take in a FilterUseCase - it uses FilterUseCase.DEFAULT
-    ******************************************************************************/
-   public void interpretValues(Map<String, Serializable> inputValues) throws QException
-   {
-      interpretValues(inputValues, FilterUseCase.DEFAULT);
-   }
-
-
-
-   /*******************************************************************************
-    ** Replace any criteria values that look like ${input.XXX} with the value of XXX
-    ** from the supplied inputValues map - where the handling of missing values
-    ** is specified in the inputted FilterUseCase parameter
-    **
-    ** Note - it may be very important that you call this method on a clone of a
-    ** QQueryFilter - e.g., if it's one that defined in metaData, and that we don't
-    ** want to be (permanently) changed!!
-    **
     *******************************************************************************/
-   public void interpretValues(Map<String, Serializable> inputValues, FilterUseCase useCase) throws QException
+   public void interpretValues(Map<String, Serializable> inputValues) throws QException
    {
       List<Exception> caughtExceptions = new ArrayList<>();
 
@@ -587,9 +545,6 @@ public class QQueryFilter implements Serializable, Cloneable
             {
                try
                {
-                  Serializable interpretedValue = value;
-                  Exception    caughtException  = null;
-
                   if(value instanceof AbstractFilterExpression<?>)
                   {
                      ///////////////////////////////////////////////////////////////////////
@@ -598,54 +553,17 @@ public class QQueryFilter implements Serializable, Cloneable
                      ///////////////////////////////////////////////////////////////////////
                      if(value instanceof FilterVariableExpression filterVariableExpression)
                      {
-                        try
-                        {
-                           interpretedValue = filterVariableExpression.evaluateInputValues(inputValues);
-                        }
-                        catch(Exception e)
-                        {
-                           caughtException = e;
-                           interpretedValue = InputNotFound.instance;
-                        }
+                        newValues.add(filterVariableExpression.evaluateInputValues(inputValues));
                      }
-                  }
-                  else
-                  {
-                     /////////////////////////////////////////////////////////////////////////////////////////////////////////
-                     // for non-expressions, cast the value to a string, and see if it can be resolved a variable.          //
-                     // there are 3 possible cases here:                                                                    //
-                     // 1: it doesn't look like a variable, so it just comes back as a string version of whatever went in.  //
-                     // 2: it was resolved from a variable to a value, e.g., ${input.someVar} => someValue                  //
-                     // 3: it looked like a variable, but no value for that variable was present in the interpreter's value //
-                     // map - so we'll get back the InputNotFound.instance.                                                 //
-                     /////////////////////////////////////////////////////////////////////////////////////////////////////////
-                     String valueAsString = ValueUtils.getValueAsString(value);
-                     interpretedValue = variableInterpreter.interpretForObject(valueAsString, InputNotFound.instance);
-                  }
-
-                  //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-                  // if interpreting a value returned the not-found value, or an empty string,                                            //
-                  // then decide how to handle the missing value, based on the use-case input                                             //
-                  // Note: questionable, using "" here, but that's what reality is passing a lot for cases we want to treat as missing... //
-                  //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-                  if(interpretedValue == InputNotFound.instance || "".equals(interpretedValue))
-                  {
-                     CriteriaMissingInputValueBehavior missingInputValueBehavior = getMissingInputValueBehavior(useCase);
-
-                     switch(missingInputValueBehavior)
+                     else
                      {
-                        case REMOVE_FROM_FILTER -> criterion.setOperator(QCriteriaOperator.TRUE);
-                        case MAKE_NO_MATCHES -> criterion.setOperator(QCriteriaOperator.FALSE);
-                        case INTERPRET_AS_NULL_VALUE -> newValues.add(null);
-
-                        /////////////////////////////////////////////////
-                        // handle case in the default: THROW_EXCEPTION //
-                        /////////////////////////////////////////////////
-                        default -> throw (Objects.requireNonNullElseGet(caughtException, () -> new QUserFacingException("Missing value for criteria on field: " + criterion.getFieldName())));
+                        newValues.add(value);
                      }
                   }
                   else
                   {
+                     String       valueAsString    = ValueUtils.getValueAsString(value);
+                     Serializable interpretedValue = variableInterpreter.interpretForObject(valueAsString);
                      newValues.add(interpretedValue);
                   }
                }
@@ -668,44 +586,6 @@ public class QQueryFilter implements Serializable, Cloneable
 
 
 
-   /***************************************************************************
-    ** Note:  in the original build of this, it felt like we *might* want to be
-    ** able to specify these behaviors at the individual criteria level, where
-    ** the implementation would be to add to QFilterCriteria:
-    ** - Map<FilterUseCase, CriteriaMissingInputValueBehavior> missingInputValueBehaviors;
-    ** - CriteriaMissingInputValueBehavior getMissingInputValueBehaviorForUseCase(FilterUseCase useCase) {}
-    *
-    ** (and maybe do that in a sub-class of QFilterCriteria, so it isn't always
-    ** there?  idk...) and then here we'd call:
-    ** - CriteriaMissingInputValueBehavior missingInputValueBehavior = criterion.getMissingInputValueBehaviorForUseCase(useCase);
-    *
-    ** But, we don't actually have that use-case at hand now, so - let's keep it
-    ** just at the level we need for now.
-    **
-    ***************************************************************************/
-   private CriteriaMissingInputValueBehavior getMissingInputValueBehavior(FilterUseCase useCase)
-   {
-      if(useCase == null)
-      {
-         useCase = FilterUseCase.DEFAULT;
-      }
-
-      CriteriaMissingInputValueBehavior missingInputValueBehavior = useCase.getDefaultCriteriaMissingInputValueBehavior();
-      if(missingInputValueBehavior == null)
-      {
-         missingInputValueBehavior = useCase.getDefaultCriteriaMissingInputValueBehavior();
-      }
-
-      if(missingInputValueBehavior == null)
-      {
-         missingInputValueBehavior = FilterUseCase.DEFAULT.getDefaultCriteriaMissingInputValueBehavior();
-      }
-
-      return (missingInputValueBehavior);
-   }
-
-
-
    /*******************************************************************************
     ** Getter for skip
     *******************************************************************************/
@@ -798,75 +678,4 @@ public class QQueryFilter implements Serializable, Cloneable
    {
       return Objects.hash(criteria, orderBys, booleanOperator, subFilters, skip, limit);
    }
-
-
-
-   /***************************************************************************
-    ** "Token" object to be used as the defaultIfLooksLikeVariableButNotFound
-    ** parameter to variableInterpreter.interpretForObject, so we can be
-    ** very clear that we got this default back (e.g., instead of a null,
-    ** which could maybe mean something else?)
-    ***************************************************************************/
-   private static final class InputNotFound implements Serializable
-   {
-      private static InputNotFound instance = new InputNotFound();
-
-
-
-      /*******************************************************************************
-       ** private singleton constructor
-       *******************************************************************************/
-      private InputNotFound()
-      {
-
-      }
-   }
-
-
-   /*******************************************************************************
-    ** Getter for subFilterSetOperator
-    *******************************************************************************/
-   public SubFilterSetOperator getSubFilterSetOperator()
-   {
-      return (this.subFilterSetOperator);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for subFilterSetOperator
-    *******************************************************************************/
-   public void setSubFilterSetOperator(SubFilterSetOperator subFilterSetOperator)
-   {
-      this.subFilterSetOperator = subFilterSetOperator;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for subFilterSetOperator
-    *******************************************************************************/
-   public QQueryFilter withSubFilterSetOperator(SubFilterSetOperator subFilterSetOperator)
-   {
-      this.subFilterSetOperator = subFilterSetOperator;
-      return (this);
-   }
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   public void applyCriteriaOptionToAllCriteria(CriteriaOptionInterface criteriaOption)
-   {
-      for(QFilterCriteria criteria : CollectionUtils.nonNullList(this.criteria))
-      {
-         criteria.withOption(criteriaOption);
-      }
-
-      for(QQueryFilter subFilter : CollectionUtils.nonNullList(subFilters))
-      {
-         subFilter.applyCriteriaOptionToAllCriteria(criteriaOption);
-      }
-   }
-
 }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/QueryInput.java

@@ -66,14 +66,6 @@ public class QueryInput extends AbstractTableActionInput implements QueryOrGetIn
    private List<QueryJoin> queryJoins     = null;
    private boolean         selectDistinct = false;
 
-   /////////////////////////////////////////////////////////////////////////////
-   // if this set is null, then the default (all fields) should be included   //
-   // if it's an empty set, that should throw an error                        //
-   // or if there are any fields in it that aren't valid fields on the table, //
-   // or in a selected queryJoin.                                             //
-   /////////////////////////////////////////////////////////////////////////////
-   private Set<String> fieldNamesToInclude;
-
    ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
    // if you say you want to includeAssociations, you can limit which ones by passing them in associationNamesToInclude. //
    // if you leave it null, you get all associations defined on the table.  if you pass it as empty, you get none.       //
@@ -694,35 +686,4 @@ public class QueryInput extends AbstractTableActionInput implements QueryOrGetIn
       return (queryHints.contains(queryHint));
    }
 
-
-
-   /*******************************************************************************
-    ** Getter for fieldNamesToInclude
-    *******************************************************************************/
-   public Set<String> getFieldNamesToInclude()
-   {
-      return (this.fieldNamesToInclude);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for fieldNamesToInclude
-    *******************************************************************************/
-   public void setFieldNamesToInclude(Set<String> fieldNamesToInclude)
-   {
-      this.fieldNamesToInclude = fieldNamesToInclude;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for fieldNamesToInclude
-    *******************************************************************************/
-   public QueryInput withFieldNamesToInclude(Set<String> fieldNamesToInclude)
-   {
-      this.fieldNamesToInclude = fieldNamesToInclude;
-      return (this);
-   }
-
 }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/expressions/AbstractFilterExpression.java

@@ -25,7 +25,6 @@ package com.kingsrook.qqq.backend.core.model.actions.tables.query.expressions;
 import java.io.Serializable;
 import java.util.Map;
 import com.kingsrook.qqq.backend.core.exceptions.QException;
-import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData;
 
 
 /*******************************************************************************
@@ -36,7 +35,7 @@ public abstract class AbstractFilterExpression<T extends Serializable> implement
    /*******************************************************************************
     **
     *******************************************************************************/
-   public abstract T evaluate(QFieldMetaData field) throws QException;
+   public abstract T evaluate() throws QException;
 
 
 
@@ -48,7 +47,7 @@ public abstract class AbstractFilterExpression<T extends Serializable> implement
     *******************************************************************************/
    public T evaluateInputValues(Map<String, Serializable> inputValues) throws QException
    {
-      return evaluate(null);
+      return evaluate();
    }
 
 

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/expressions/FilterVariableExpression.java

@@ -26,7 +26,6 @@ import java.io.Serializable;
 import java.util.Map;
 import com.kingsrook.qqq.backend.core.exceptions.QException;
 import com.kingsrook.qqq.backend.core.exceptions.QUserFacingException;
-import com.kingsrook.qqq.backend.core.model.metadata.fields.QFieldMetaData;
 import com.kingsrook.qqq.backend.core.utils.ValueUtils;
 
 
@@ -46,7 +45,7 @@ public class FilterVariableExpression extends AbstractFilterExpression<Serializa
     **
     *******************************************************************************/
    @Override
-   public Serializable evaluate(QFieldMetaData field) throws QException
+   public Serializable evaluate() throws QException
    {
       throw (new QUserFacingException("Missing variable value."));
    }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/expressions/Now.java

@@ -22,42 +22,23 @@
 package com.kingsrook.qqq.backend.core.model.actions.tables.query.expressions;
 
 
-import java.io.Serializable;
 import java.time.Instant;
-import java.time.ZoneId;
 import com.kingsrook.qqq.backend.core.exceptions.QException;
-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.utils.ValueUtils;
 
 
 /*******************************************************************************
  **
  *******************************************************************************/
-public class Now extends AbstractFilterExpression<Serializable>
+public class Now extends AbstractFilterExpression<Instant>
 {
 
    /*******************************************************************************
     **
     *******************************************************************************/
    @Override
-   public Serializable evaluate(QFieldMetaData field) throws QException
+   public Instant evaluate() throws QException
    {
-      QFieldType type = field == null ? QFieldType.DATE_TIME : field.getType();
-
-      if(type.equals(QFieldType.DATE_TIME))
-      {
-         return (Instant.now());
-      }
-      else if(type.equals(QFieldType.DATE))
-      {
-         ZoneId zoneId = ValueUtils.getSessionOrInstanceZoneId();
-         return (Instant.now().atZone(zoneId).toLocalDate());
-      }
-      else
-      {
-         throw (new QException("Unsupported field type [" + type + "]"));
-      }
+      return (Instant.now());
    }
 
 }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/expressions/NowWithOffset.java

@@ -22,24 +22,19 @@
 package com.kingsrook.qqq.backend.core.model.actions.tables.query.expressions;
 
 
-import java.io.Serializable;
 import java.time.Instant;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.temporal.ChronoUnit;
 import java.util.concurrent.TimeUnit;
 import com.kingsrook.qqq.backend.core.exceptions.QException;
-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.utils.ValueUtils;
 
 
 /*******************************************************************************
  **
  *******************************************************************************/
-public class NowWithOffset extends AbstractFilterExpression<Serializable>
+public class NowWithOffset extends AbstractFilterExpression<Instant>
 {
    private Operator   operator;
    private int        amount;
@@ -128,30 +123,7 @@ public class NowWithOffset extends AbstractFilterExpression<Serializable>
     **
     *******************************************************************************/
    @Override
-   public Serializable evaluate(QFieldMetaData field) throws QException
-   {
-      QFieldType type = field == null ? QFieldType.DATE_TIME : field.getType();
-
-      if(type.equals(QFieldType.DATE_TIME))
-      {
-         return (evaluateForDateTime());
-      }
-      else if(type.equals(QFieldType.DATE))
-      {
-         return (evaluateForDate());
-      }
-      else
-      {
-         throw (new QException("Unsupported field type [" + type + "]"));
-      }
-   }
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   private Instant evaluateForDateTime()
+   public Instant evaluate() throws QException
    {
       /////////////////////////////////////////////////////////////////////////////
       // Instant doesn't let us plus/minus WEEK, MONTH, or YEAR...               //
@@ -175,26 +147,6 @@ public class NowWithOffset extends AbstractFilterExpression<Serializable>
 
 
 
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   private LocalDate evaluateForDate()
-   {
-      ZoneId    zoneId = ValueUtils.getSessionOrInstanceZoneId();
-      LocalDate now    = Instant.now().atZone(zoneId).toLocalDate();
-
-      if(operator.equals(Operator.PLUS))
-      {
-         return (now.plus(amount, timeUnit));
-      }
-      else
-      {
-         return (now.minus(amount, timeUnit));
-      }
-   }
-
-
-
    /*******************************************************************************
     ** Getter for operator
     **

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/query/expressions/ThisOrLastPeriod.java

@@ -22,32 +22,27 @@
 package com.kingsrook.qqq.backend.core.model.actions.tables.query.expressions;
 
 
-import java.io.Serializable;
 import java.time.DayOfWeek;
 import java.time.Instant;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.temporal.ChronoField;
 import java.time.temporal.ChronoUnit;
 import com.kingsrook.qqq.backend.core.exceptions.QException;
 import com.kingsrook.qqq.backend.core.exceptions.QRuntimeException;
-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.utils.ValueUtils;
 
 
 /*******************************************************************************
  **
  *******************************************************************************/
-public class ThisOrLastPeriod extends AbstractFilterExpression<Serializable>
+public class ThisOrLastPeriod extends AbstractFilterExpression<Instant>
 {
    private Operator   operator;
    private ChronoUnit timeUnit;
 
 
 
-
    /***************************************************************************
     **
     ***************************************************************************/
@@ -93,7 +88,7 @@ public class ThisOrLastPeriod extends AbstractFilterExpression<Serializable>
     ** Factory
     **
     *******************************************************************************/
-   public static ThisOrLastPeriod last(ChronoUnit timeUnit)
+   public static ThisOrLastPeriod last(int amount, ChronoUnit timeUnit)
    {
       return (new ThisOrLastPeriod(Operator.LAST, timeUnit));
    }
@@ -104,31 +99,7 @@ public class ThisOrLastPeriod extends AbstractFilterExpression<Serializable>
     **
     *******************************************************************************/
    @Override
-   public Serializable evaluate(QFieldMetaData field) throws QException
-   {
-      QFieldType type = field == null ? QFieldType.DATE_TIME : field.getType();
-
-      if(type.equals(QFieldType.DATE_TIME))
-      {
-         return (evaluateForDateTime());
-      }
-      else if(type.equals(QFieldType.DATE))
-      {
-         // return (evaluateForDateTime());
-         return (evaluateForDate());
-      }
-      else
-      {
-         throw (new QException("Unsupported field type [" + type + "]"));
-      }
-   }
-
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   private Instant evaluateForDateTime()
+   public Instant evaluate() throws QException
    {
       ZoneId zoneId = ValueUtils.getSessionOrInstanceZoneId();
 
@@ -183,57 +154,7 @@ public class ThisOrLastPeriod extends AbstractFilterExpression<Serializable>
 
             return operator.equals(Operator.THIS) ? startOfThisYear : startOfLastYear;
          }
-         default -> throw (new QRuntimeException("Unsupported unit: " + timeUnit));
-      }
-   }
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   public LocalDate evaluateForDate()
-   {
-      ZoneId    zoneId = ValueUtils.getSessionOrInstanceZoneId();
-      LocalDate today  = Instant.now().atZone(zoneId).toLocalDate();
-
-      switch(timeUnit)
-      {
-         case DAYS ->
-         {
-            return operator.equals(Operator.THIS) ? today : today.minusDays(1);
-         }
-         case WEEKS ->
-         {
-            LocalDate startOfThisWeek = today;
-            while(startOfThisWeek.get(ChronoField.DAY_OF_WEEK) != DayOfWeek.SUNDAY.getValue())
-            {
-               ////////////////////////////////////////
-               // go backwards until sunday is found //
-               ////////////////////////////////////////
-               startOfThisWeek = startOfThisWeek.minusDays(1);
-            }
-            return operator.equals(Operator.THIS) ? startOfThisWeek : startOfThisWeek.minusDays(7);
-         }
-         case MONTHS ->
-         {
-            Instant       startOfThisMonth    = ValueUtils.getStartOfMonthInZoneId(zoneId.getId());
-            LocalDateTime startOfThisMonthLDT = LocalDateTime.ofInstant(startOfThisMonth, ZoneId.of(zoneId.getId()));
-            LocalDateTime startOfLastMonthLDT = startOfThisMonthLDT.minusMonths(1);
-            Instant       startOfLastMonth    = startOfLastMonthLDT.toInstant(ZoneId.of(zoneId.getId()).getRules().getOffset(Instant.now()));
-
-            return (operator.equals(Operator.THIS) ? startOfThisMonth : startOfLastMonth).atZone(zoneId).toLocalDate();
-         }
-         case YEARS ->
-         {
-            Instant       startOfThisYear    = ValueUtils.getStartOfYearInZoneId(zoneId.getId());
-            LocalDateTime startOfThisYearLDT = LocalDateTime.ofInstant(startOfThisYear, zoneId);
-            LocalDateTime startOfLastYearLDT = startOfThisYearLDT.minusYears(1);
-            Instant       startOfLastYear    = startOfLastYearLDT.toInstant(zoneId.getRules().getOffset(Instant.now()));
-
-            return (operator.equals(Operator.THIS) ? startOfThisYear : startOfLastYear).atZone(zoneId).toLocalDate();
-         }
-         default -> throw (new QRuntimeException("Unsupported unit: " + timeUnit));
+         default -> throw (new QRuntimeException("Unsupported timeUnit: " + timeUnit));
       }
    }
 

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/actions/tables/storage/StorageInput.java

@@ -22,17 +22,15 @@
 package com.kingsrook.qqq.backend.core.model.actions.tables.storage;
 
 
-import java.io.Serializable;
 import com.kingsrook.qqq.backend.core.model.actions.AbstractTableActionInput;
 
 
 /*******************************************************************************
  ** Input for Storage actions.
  *******************************************************************************/
-public class StorageInput extends AbstractTableActionInput implements Serializable
+public class StorageInput extends AbstractTableActionInput
 {
    private String reference;
-   private String contentType;
 
 
 
@@ -76,35 +74,4 @@ public class StorageInput extends AbstractTableActionInput implements Serializab
       return (this);
    }
 
-
-
-   /*******************************************************************************
-    ** Getter for contentType
-    *******************************************************************************/
-   public String getContentType()
-   {
-      return (this.contentType);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for contentType
-    *******************************************************************************/
-   public void setContentType(String contentType)
-   {
-      this.contentType = contentType;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for contentType
-    *******************************************************************************/
-   public StorageInput withContentType(String contentType)
-   {
-      this.contentType = contentType;
-      return (this);
-   }
-
 }

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

@@ -38,10 +38,9 @@ public class SearchPossibleValueSourceInput extends AbstractActionInput implemen
    private QQueryFilter       defaultQueryFilter;
    private String             searchTerm;
    private List<Serializable> idList;
-   private List<String>       labelList;
 
    private Integer skip  = 0;
-   private Integer limit = 250;
+   private Integer limit = 100;
 
 
 
@@ -282,35 +281,4 @@ public class SearchPossibleValueSourceInput extends AbstractActionInput implemen
       this.limit = limit;
       return (this);
    }
-
-
-   /*******************************************************************************
-    ** Getter for labelList
-    *******************************************************************************/
-   public List<String> getLabelList()
-   {
-      return (this.labelList);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for labelList
-    *******************************************************************************/
-   public void setLabelList(List<String> labelList)
-   {
-      this.labelList = labelList;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for labelList
-    *******************************************************************************/
-   public SearchPossibleValueSourceInput withLabelList(List<String> labelList)
-   {
-      this.labelList = labelList;
-      return (this);
-   }
-
 }

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

@@ -35,7 +35,6 @@ public class SearchPossibleValueSourceOutput extends AbstractActionOutput
 {
    private List<QPossibleValue<?>> results = new ArrayList<>();
 
-   private String warning;
 
 
    /*******************************************************************************
@@ -89,35 +88,4 @@ public class SearchPossibleValueSourceOutput extends AbstractActionOutput
       return (this);
    }
 
-
-   /*******************************************************************************
-    ** Getter for warning
-    *******************************************************************************/
-   public String getWarning()
-   {
-      return (this.warning);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for warning
-    *******************************************************************************/
-   public void setWarning(String warning)
-   {
-      this.warning = warning;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for warning
-    *******************************************************************************/
-   public SearchPossibleValueSourceOutput withWarning(String warning)
-   {
-      this.warning = warning;
-      return (this);
-   }
-
-
 }

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

@@ -220,7 +220,7 @@ public class AuditsMetaDataProvider
          .withRecordLabelFormat("%s %s")
          .withRecordLabelFields("auditTableId", "recordId")
          .withPrimaryKeyField("id")
-         .withField(new QFieldMetaData("id", QFieldType.LONG))
+         .withField(new QFieldMetaData("id", QFieldType.INTEGER))
          .withField(new QFieldMetaData("auditTableId", QFieldType.INTEGER).withPossibleValueSourceName(TABLE_NAME_AUDIT_TABLE))
          .withField(new QFieldMetaData("auditUserId", QFieldType.INTEGER).withPossibleValueSourceName(TABLE_NAME_AUDIT_USER))
          .withField(new QFieldMetaData("recordId", QFieldType.INTEGER))
@@ -243,8 +243,8 @@ public class AuditsMetaDataProvider
          .withRecordLabelFormat("%s")
          .withRecordLabelFields("id")
          .withPrimaryKeyField("id")
-         .withField(new QFieldMetaData("id", QFieldType.LONG))
-         .withField(new QFieldMetaData("auditId", QFieldType.LONG).withPossibleValueSourceName(TABLE_NAME_AUDIT))
+         .withField(new QFieldMetaData("id", QFieldType.INTEGER))
+         .withField(new QFieldMetaData("auditId", QFieldType.INTEGER).withPossibleValueSourceName(TABLE_NAME_AUDIT))
          .withField(new QFieldMetaData("message", QFieldType.STRING).withMaxLength(250).withBehavior(ValueTooLongBehavior.TRUNCATE_ELLIPSIS))
          .withField(new QFieldMetaData("fieldName", QFieldType.STRING).withMaxLength(100).withBehavior(ValueTooLongBehavior.TRUNCATE_ELLIPSIS))
          .withField(new QFieldMetaData("oldValue", QFieldType.STRING).withMaxLength(250).withBehavior(ValueTooLongBehavior.TRUNCATE_ELLIPSIS))

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/AlertData.java

@@ -22,9 +22,6 @@
 package com.kingsrook.qqq.backend.core.model.dashboard.widgets;
 
 
-import java.util.List;
-
-
 /*******************************************************************************
  ** Model containing datastructure expected by frontend alert widget
  **
@@ -43,10 +40,8 @@ public class AlertData extends QWidgetData
 
 
 
-   private String       html;
-   private AlertType    alertType;
-   private Boolean      hideWidget = false;
-   private List<String> bulletList;
+   private String    html;
+   private AlertType alertType;
 
 
 
@@ -144,66 +139,4 @@ public class AlertData extends QWidgetData
       return (this);
    }
 
-
-
-   /*******************************************************************************
-    ** Getter for hideWidget
-    *******************************************************************************/
-   public boolean getHideWidget()
-   {
-      return (this.hideWidget);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for hideWidget
-    *******************************************************************************/
-   public void setHideWidget(boolean hideWidget)
-   {
-      this.hideWidget = hideWidget;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for hideWidget
-    *******************************************************************************/
-   public AlertData withHideWidget(boolean hideWidget)
-   {
-      this.hideWidget = hideWidget;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for bulletList
-    *******************************************************************************/
-   public List<String> getBulletList()
-   {
-      return (this.bulletList);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for bulletList
-    *******************************************************************************/
-   public void setBulletList(List<String> bulletList)
-   {
-      this.bulletList = bulletList;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for bulletList
-    *******************************************************************************/
-   public AlertData withBulletList(List<String> bulletList)
-   {
-      this.bulletList = bulletList;
-      return (this);
-   }
-
 }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/ChildRecordListData.java

@@ -39,19 +39,13 @@ public class ChildRecordListData extends QWidgetData
    private QueryOutput    queryOutput;
    private QTableMetaData childTableMetaData;
 
-   private String  tableName;
    private String  tablePath;
    private String  viewAllLink;
    private Integer totalRows;
-   private Boolean disableRowClick   = false;
-   private Boolean allowRecordEdit   = false;
-   private Boolean allowRecordDelete = false;
-   private Boolean isInProcess       = false;
 
    private boolean                   canAddChildRecord = false;
    private Map<String, Serializable> defaultValuesForNewChildRecords;
    private Set<String>               disabledFieldsForNewChildRecords;
-   private Map<String, String>       defaultValuesForNewChildRecordsFromParentFields;
 
 
 
@@ -358,204 +352,4 @@ public class ChildRecordListData extends QWidgetData
       return (this);
    }
 
-
-
-   /*******************************************************************************
-    ** Getter for tableName
-    *******************************************************************************/
-   public String getTableName()
-   {
-      return (this.tableName);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for tableName
-    *******************************************************************************/
-   public void setTableName(String tableName)
-   {
-      this.tableName = tableName;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for tableName
-    *******************************************************************************/
-   public ChildRecordListData withTableName(String tableName)
-   {
-      this.tableName = tableName;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for tablePath
-    *******************************************************************************/
-   public ChildRecordListData withTablePath(String tablePath)
-   {
-      this.tablePath = tablePath;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for disableRowClick
-    *******************************************************************************/
-   public Boolean getDisableRowClick()
-   {
-      return (this.disableRowClick);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for disableRowClick
-    *******************************************************************************/
-   public void setDisableRowClick(Boolean disableRowClick)
-   {
-      this.disableRowClick = disableRowClick;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for disableRowClick
-    *******************************************************************************/
-   public ChildRecordListData withDisableRowClick(Boolean disableRowClick)
-   {
-      this.disableRowClick = disableRowClick;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for allowRecordEdit
-    *******************************************************************************/
-   public Boolean getAllowRecordEdit()
-   {
-      return (this.allowRecordEdit);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for allowRecordEdit
-    *******************************************************************************/
-   public void setAllowRecordEdit(Boolean allowRecordEdit)
-   {
-      this.allowRecordEdit = allowRecordEdit;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for allowRecordEdit
-    *******************************************************************************/
-   public ChildRecordListData withAllowRecordEdit(Boolean allowRecordEdit)
-   {
-      this.allowRecordEdit = allowRecordEdit;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for allowRecordDelete
-    *******************************************************************************/
-   public Boolean getAllowRecordDelete()
-   {
-      return (this.allowRecordDelete);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for allowRecordDelete
-    *******************************************************************************/
-   public void setAllowRecordDelete(Boolean allowRecordDelete)
-   {
-      this.allowRecordDelete = allowRecordDelete;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for allowRecordDelete
-    *******************************************************************************/
-   public ChildRecordListData withAllowRecordDelete(Boolean allowRecordDelete)
-   {
-      this.allowRecordDelete = allowRecordDelete;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for isInProcess
-    *******************************************************************************/
-   public Boolean getIsInProcess()
-   {
-      return (this.isInProcess);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for isInProcess
-    *******************************************************************************/
-   public void setIsInProcess(Boolean isInProcess)
-   {
-      this.isInProcess = isInProcess;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for isInProcess
-    *******************************************************************************/
-   public ChildRecordListData withIsInProcess(Boolean isInProcess)
-   {
-      this.isInProcess = isInProcess;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for defaultValuesForNewChildRecordsFromParentFields
-    *******************************************************************************/
-   public Map<String, String> getDefaultValuesForNewChildRecordsFromParentFields()
-   {
-      return (this.defaultValuesForNewChildRecordsFromParentFields);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for defaultValuesForNewChildRecordsFromParentFields
-    *******************************************************************************/
-   public void setDefaultValuesForNewChildRecordsFromParentFields(Map<String, String> defaultValuesForNewChildRecordsFromParentFields)
-   {
-      this.defaultValuesForNewChildRecordsFromParentFields = defaultValuesForNewChildRecordsFromParentFields;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for defaultValuesForNewChildRecordsFromParentFields
-    *******************************************************************************/
-   public ChildRecordListData withDefaultValuesForNewChildRecordsFromParentFields(Map<String, String> defaultValuesForNewChildRecordsFromParentFields)
-   {
-      this.defaultValuesForNewChildRecordsFromParentFields = defaultValuesForNewChildRecordsFromParentFields;
-      return (this);
-   }
-
 }
-
-
-

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/CompositeWidgetData.java

@@ -40,24 +40,9 @@ public class CompositeWidgetData extends AbstractBlockWidgetData<CompositeWidget
 {
    private List<AbstractBlockWidgetData<?, ?, ?, ?>> blocks = new ArrayList<>();
 
-   private ModalMode modalMode;
+   private Map<String, Serializable> styleOverrides = new HashMap<>();
 
-
-
-   /***************************************************************************
-    **
-    ***************************************************************************/
-   public enum ModalMode
-   {
-      MODAL
-   }
-
-
-
-   private Layout                    layout;
-   private Map<String, Serializable> styleOverrides        = new HashMap<>();
-   private String                    overlayHtml;
-   private Map<String, Serializable> overlayStyleOverrides = new HashMap<>();
+   private Layout layout;
 
 
 
@@ -66,14 +51,12 @@ public class CompositeWidgetData extends AbstractBlockWidgetData<CompositeWidget
     *******************************************************************************/
    public enum Layout
    {
-      /////////////////////////////////////////////////////////
-      // note, these are used in QQQ FMD CompositeWidget.tsx //
-      // and qqq-android CompositeWidgetBlock.kt             //
-      /////////////////////////////////////////////////////////
+      /////////////////////////////////////////////////////////////
+      // note, these are used in QQQ FMD CompositeWidgetData.tsx //
+      /////////////////////////////////////////////////////////////
       FLEX_COLUMN,
       FLEX_ROW_WRAPPED,
       FLEX_ROW_SPACE_BETWEEN,
-      FLEX_ROW_CENTER,
       TABLE_SUB_ROW_DETAILS,
       BADGES_WRAPPER
    }
@@ -235,122 +218,4 @@ public class CompositeWidgetData extends AbstractBlockWidgetData<CompositeWidget
       return (this);
    }
 
-
-
-   /*******************************************************************************
-    ** Getter for overlayHtml
-    *******************************************************************************/
-   public String getOverlayHtml()
-   {
-      return (this.overlayHtml);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for overlayHtml
-    *******************************************************************************/
-   public void setOverlayHtml(String overlayHtml)
-   {
-      this.overlayHtml = overlayHtml;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for overlayHtml
-    *******************************************************************************/
-   public CompositeWidgetData withOverlayHtml(String overlayHtml)
-   {
-      this.overlayHtml = overlayHtml;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for overlayStyleOverrides
-    *******************************************************************************/
-   public Map<String, Serializable> getOverlayStyleOverrides()
-   {
-      return (this.overlayStyleOverrides);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for overlayStyleOverrides
-    *******************************************************************************/
-   public void setOverlayStyleOverrides(Map<String, Serializable> overlayStyleOverrides)
-   {
-      this.overlayStyleOverrides = overlayStyleOverrides;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for overlayStyleOverrides
-    *******************************************************************************/
-   public CompositeWidgetData withOverlayStyleOverrides(Map<String, Serializable> overlayStyleOverrides)
-   {
-      this.overlayStyleOverrides = overlayStyleOverrides;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   public CompositeWidgetData withOverlayStyleOverride(String key, Serializable value)
-   {
-      addOverlayStyleOverride(key, value);
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   public void addOverlayStyleOverride(String key, Serializable value)
-   {
-      if(this.overlayStyleOverrides == null)
-      {
-         this.overlayStyleOverrides = new HashMap<>();
-      }
-      this.overlayStyleOverrides.put(key, value);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for modalMode
-    *******************************************************************************/
-   public ModalMode getModalMode()
-   {
-      return (this.modalMode);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for modalMode
-    *******************************************************************************/
-   public void setModalMode(ModalMode modalMode)
-   {
-      this.modalMode = modalMode;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for modalMode
-    *******************************************************************************/
-   public CompositeWidgetData withModalMode(ModalMode modalMode)
-   {
-      this.modalMode = modalMode;
-      return (this);
-   }
-
 }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/FilterAndColumnsSetupData.java

@@ -34,12 +34,8 @@ public class FilterAndColumnsSetupData extends QWidgetData
    private String       tableName;
    private Boolean      allowVariables = false;
    private Boolean      hideColumns    = false;
-   private Boolean      hidePreview    = false;
    private List<String> filterDefaultFieldNames;
 
-   private String filterFieldName = "queryFilterJson";
-   private String columnFieldName = "columnsJson";
-
 
 
    /*******************************************************************************
@@ -197,97 +193,4 @@ public class FilterAndColumnsSetupData extends QWidgetData
       return (this);
    }
 
-
-
-   /*******************************************************************************
-    ** Getter for hidePreview
-    *******************************************************************************/
-   public Boolean getHidePreview()
-   {
-      return (this.hidePreview);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for hidePreview
-    *******************************************************************************/
-   public void setHidePreview(Boolean hidePreview)
-   {
-      this.hidePreview = hidePreview;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for hidePreview
-    *******************************************************************************/
-   public FilterAndColumnsSetupData withHidePreview(Boolean hidePreview)
-   {
-      this.hidePreview = hidePreview;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for filterFieldName
-    *******************************************************************************/
-   public String getFilterFieldName()
-   {
-      return (this.filterFieldName);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for filterFieldName
-    *******************************************************************************/
-   public void setFilterFieldName(String filterFieldName)
-   {
-      this.filterFieldName = filterFieldName;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for filterFieldName
-    *******************************************************************************/
-   public FilterAndColumnsSetupData withFilterFieldName(String filterFieldName)
-   {
-      this.filterFieldName = filterFieldName;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for columnFieldName
-    *******************************************************************************/
-   public String getColumnFieldName()
-   {
-      return (this.columnFieldName);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for columnFieldName
-    *******************************************************************************/
-   public void setColumnFieldName(String columnFieldName)
-   {
-      this.columnFieldName = columnFieldName;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for columnFieldName
-    *******************************************************************************/
-   public FilterAndColumnsSetupData withColumnFieldName(String columnFieldName)
-   {
-      this.columnFieldName = columnFieldName;
-      return (this);
-   }
-
 }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/QWidgetData.java

@@ -31,7 +31,7 @@ import java.util.Map;
  ** Base class for the data returned by rendering a Widget.
  **
  *******************************************************************************/
-public abstract class QWidgetData implements Serializable
+public abstract class QWidgetData
 {
    private String       label;
    private String       sublabel;

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/WidgetType.java

@@ -66,7 +66,6 @@ public enum WidgetType
    // record view/edit widgets //
    //////////////////////////////
    CHILD_RECORD_LIST("childRecordList"),
-   CUSTOM_COMPONENT("customComponent"),
    DYNAMIC_FORM("dynamicForm"),
    DATA_BAG_VIEWER("dataBagViewer"),
    PIVOT_TABLE_SETUP("pivotTableSetup"),

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/blocks/AbstractBlockWidgetData.java

@@ -24,7 +24,6 @@ package com.kingsrook.qqq.backend.core.model.dashboard.widgets.blocks;
 
 import java.util.HashMap;
 import java.util.Map;
-import com.kingsrook.qqq.backend.core.model.dashboard.widgets.CompositeWidgetData;
 import com.kingsrook.qqq.backend.core.model.dashboard.widgets.QWidgetData;
 
 
@@ -52,11 +51,6 @@ public abstract class AbstractBlockWidgetData<
    private V  values;
    private SX styles;
 
-   ///////////////////////////////////////////////////////////////////////////////////
-   // optional field name to act as a 'guard' for the block - e.g., only include it //
-   // if the value for this field is true                                           //
-   ///////////////////////////////////////////////////////////////////////////////////
-   private String conditional;
 
 
    /*******************************************************************************
@@ -209,19 +203,6 @@ public abstract class AbstractBlockWidgetData<
 
 
 
-   /*******************************************************************************
-    ** Fluent setter for tooltip
-    **
-    *******************************************************************************/
-   @SuppressWarnings("unchecked")
-   public T withTooltip(CompositeWidgetData data)
-   {
-      this.tooltip = new BlockTooltip(data);
-      return (T) (this);
-   }
-
-
-
    /*******************************************************************************
     **
     *******************************************************************************/
@@ -417,7 +398,6 @@ public abstract class AbstractBlockWidgetData<
    }
 
 
-
    /*******************************************************************************
     ** Getter for blockId
     *******************************************************************************/
@@ -449,34 +429,4 @@ public abstract class AbstractBlockWidgetData<
    }
 
 
-   /*******************************************************************************
-    ** Getter for conditional
-    *******************************************************************************/
-   public String getConditional()
-   {
-      return (this.conditional);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for conditional
-    *******************************************************************************/
-   public void setConditional(String conditional)
-   {
-      this.conditional = conditional;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for conditional
-    *******************************************************************************/
-   public AbstractBlockWidgetData withConditional(String conditional)
-   {
-      this.conditional = conditional;
-      return (this);
-   }
-
-
 }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/blocks/BlockTooltip.java

@@ -22,18 +22,14 @@
 package com.kingsrook.qqq.backend.core.model.dashboard.widgets.blocks;
 
 
-import com.kingsrook.qqq.backend.core.model.dashboard.widgets.CompositeWidgetData;
-
-
 /*******************************************************************************
  ** A tooltip used within a (widget) block.
  **
  *******************************************************************************/
 public class BlockTooltip
 {
-   private CompositeWidgetData blockData;
-   private String              title;
-   private Placement           placement = Placement.BOTTOM;
+   private String    title;
+   private Placement placement = Placement.BOTTOM;
 
 
 
@@ -66,17 +62,6 @@ public class BlockTooltip
 
 
 
-   /*******************************************************************************
-    ** Constructor
-    **
-    *******************************************************************************/
-   public BlockTooltip(CompositeWidgetData blockData)
-   {
-      this.blockData = blockData;
-   }
-
-
-
    /*******************************************************************************
     ** Getter for title
     *******************************************************************************/
@@ -137,35 +122,4 @@ public class BlockTooltip
       return (this);
    }
 
-
-
-   /*******************************************************************************
-    ** Getter for blockData
-    *******************************************************************************/
-   public CompositeWidgetData getBlockData()
-   {
-      return (this.blockData);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for blockData
-    *******************************************************************************/
-   public void setBlockData(CompositeWidgetData blockData)
-   {
-      this.blockData = blockData;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for blockData
-    *******************************************************************************/
-   public BlockTooltip withBlockData(CompositeWidgetData blockData)
-   {
-      this.blockData = blockData;
-      return (this);
-   }
-
 }

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/blocks/audio/AudioBlockData.java

@@ -1,45 +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.dashboard.widgets.blocks.audio;
-
-
-import com.kingsrook.qqq.backend.core.model.dashboard.widgets.blocks.AbstractBlockWidgetData;
-import com.kingsrook.qqq.backend.core.model.dashboard.widgets.blocks.base.BaseSlots;
-import com.kingsrook.qqq.backend.core.model.dashboard.widgets.blocks.base.BaseStyles;
-
-
-/*******************************************************************************
- ** block that plays an audio file
- *******************************************************************************/
-public class AudioBlockData extends AbstractBlockWidgetData<AudioBlockData, AudioValues, BaseSlots, BaseStyles>
-{
-
-   /*******************************************************************************
-    **
-    *******************************************************************************/
-   @Override
-   public String getBlockTypeName()
-   {
-      return "AUDIO";
-   }
-
-}

qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/model/dashboard/widgets/blocks/audio/AudioValues.java

@@ -1,130 +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.dashboard.widgets.blocks.audio;
-
-
-import com.kingsrook.qqq.backend.core.model.dashboard.widgets.blocks.BlockValuesInterface;
-
-
-/*******************************************************************************
- **
- *******************************************************************************/
-public class AudioValues implements BlockValuesInterface
-{
-   private String  path;
-   private boolean showControls = false;
-   private boolean autoPlay     = true;
-
-
-
-   /*******************************************************************************
-    ** Getter for path
-    *******************************************************************************/
-   public String getPath()
-   {
-      return (this.path);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for path
-    *******************************************************************************/
-   public void setPath(String path)
-   {
-      this.path = path;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for path
-    *******************************************************************************/
-   public AudioValues withPath(String path)
-   {
-      this.path = path;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for showControls
-    *******************************************************************************/
-   public boolean getShowControls()
-   {
-      return (this.showControls);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for showControls
-    *******************************************************************************/
-   public void setShowControls(boolean showControls)
-   {
-      this.showControls = showControls;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for showControls
-    *******************************************************************************/
-   public AudioValues withShowControls(boolean showControls)
-   {
-      this.showControls = showControls;
-      return (this);
-   }
-
-
-
-   /*******************************************************************************
-    ** Getter for autoPlay
-    *******************************************************************************/
-   public boolean getAutoPlay()
-   {
-      return (this.autoPlay);
-   }
-
-
-
-   /*******************************************************************************
-    ** Setter for autoPlay
-    *******************************************************************************/
-   public void setAutoPlay(boolean autoPlay)
-   {
-      this.autoPlay = autoPlay;
-   }
-
-
-
-   /*******************************************************************************
-    ** Fluent setter for autoPlay
-    *******************************************************************************/
-   public AudioValues withAutoPlay(boolean autoPlay)
-   {
-      this.autoPlay = autoPlay;
-      return (this);
-   }
-
-}