v7.1.0 - Merge pull request #582 from ColdBox/development

v7.1.0
ColdBox · Aug 3, 2023 · 537cb55 · 537cb55
2 parents f7edf16 + 3b5b80b
commit 537cb55
Show file tree

Hide file tree

Showing 42 changed files with 473 additions and 346 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -6,7 +6,7 @@ on:
   workflow_call:
     secrets:
       SLACK_WEBHOOK_URL:
-        required: true
+        required: false
 
 jobs:
   tests:
@@ -19,15 +19,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        commandbox_version: [ "5.8.0" ]
-        cfengine: [ "lucee@5", "adobe@2018", "adobe@2021" ]
+        commandbox_version: [ "5.9.0" ]
+        cfengine: [ "lucee@5", "adobe@2018", "adobe@2021", "adobe@2023" ]
         jdkVersion: [ "11" ]
         experimental: [false]
         include:
-          - cfengine: "lucee@5rc"
-            commandbox_version: "6.0.0-alpha"
-            jdkVersion: "11"
-            experimental: true
           - cfengine: "lucee@6"
             commandbox_version: "6.0.0-alpha"
             jdkVersion: "11"
@@ -37,13 +33,9 @@ jobs:
             jdkVersion: "17"
             experimental: true
           - cfengine: "adobe@2023"
-            commandbox_version: "6.0.0-alpha"
-            jdkVersion: "11"
-            experimental: true
-          - cfengine: "adobe@2023"
-            commandbox_version: "6.0.0-alpha"
+            commandbox_version: "5.9.0"
             jdkVersion: "17"
-            experimental: true
+            experimental: false
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v2
@@ -126,6 +118,8 @@ jobs:
       - name: Failure Debugging Info
         if: ${{ failure() }}
         run: |
+          box version
+          box server info serverConfigFile="server-${{ matrix.cfengine }}.json" --json
           box server log serverConfigFile="server-${{ matrix.cfengine }}.json"
 
       - name: Upload Debugging Info To Artifacts

diff --git a/box.json b/box.json
@@ -1,6 +1,6 @@
 {
     "name":"ColdBox Platform",
-    "version":"7.0.0",
+    "version":"7.1.0",
     "location":"https://downloads.ortussolutions.com/ortussolutions/coldbox/@build.version@/[email protected]@.zip",
     "author":"Ortus Solutions <[email protected]>",
     "slug":"coldbox",
@@ -42,7 +42,7 @@
         "cbproxies":"^1.0.1+13"
     },
     "devDependencies":{
-        "testbox":"be",
+        "testbox":"^5.1.0+2",
         "commandbox-dotenv":"*",
         "commandbox-cfconfig":"*",
         "commandbox-cfformat":"*"
@@ -55,19 +55,19 @@
         "start:lucee":"server start serverConfigFile='[email protected]' --force",
         "start:2018":"server start serverConfigFile='[email protected]' --force",
         "start:2021":"server start serverConfigFile='[email protected]' --force",
-		"start:2023":"server start serverConfigFile="[email protected]" --force",
-		"stop:lucee":"server stop serverConfigFile="[email protected]" --force",
+        "start:2023":"server start serverConfigFile="[email protected]" --force",
+        "stop:lucee":"server stop serverConfigFile="[email protected]" --force",
         "stop:2018":"server stop serverConfigFile='[email protected]' --force",
         "stop:2021":"server stop serverConfigFile='[email protected]' --force",
-		"stop:2023":"server stop serverConfigFile="[email protected]" --force",
+        "stop:2023":"server stop serverConfigFile="[email protected]" --force",
         "log:lucee":"server log coldbox-lucee@5 --follow",
         "log:2018":"server log coldbox-adobe@2018 --follow",
         "log:2021":"server log coldbox-adobe@2021 --follow",
-		"log:2023":"server log coldbox-adobe@2023 --follow",
+        "log:2023":"server log coldbox-adobe@2023 --follow",
         "cfpm":"echo '\".engine/acf2021/WEB-INF/cfusion/bin/cfpm.sh\"' | run",
         "cfpm:install":"echo '\".engine/adobe2021/WEB-INF/cfusion/bin/cfpm.sh\" install ${1}' | run"
     },
-	"installPaths":{
+    "installPaths":{
         "testbox":"testbox/",
         "cbproxies":"system/async/cbproxies/"
     }

diff --git a/build/build.xml b/build/build.xml
@@ -277,10 +277,7 @@
         	<fileset dir="system/async" />
         </copy>
 		<copy todir="${dir.build}/cachebox/system/core" encoding="UTF-8" overwrite="true">
-        	<fileset dir="system/core">
-        		<exclude name="mail/*" />
-        		<exclude name="db/*" />
-        	</fileset>
+        	<fileset dir="system/core" />
         </copy>
 		<copy todir="${dir.build}/cachebox/system/logging" encoding="UTF-8" overwrite="true">
         	<fileset dir="system/logging" />
@@ -394,12 +391,7 @@
         	<fileset dir="system/async" />
         </copy>
 		<copy todir="${dir.build}/logbox/system/core" encoding="UTF-8" overwrite="true">
-        	<fileset dir="system/core">
-        		<include name="util/*" />
-        		<include name="dynamic/*" />
-        		<include name="collections/*" />
-        		<include name="conversion/*" />
-        	</fileset>
+        	<fileset dir="system/core" />
         </copy>
         <!--Copy text files to root folder-->
 		<copy todir="${dir.build}/logbox" encoding="UTF-8" overwrite="true">
@@ -513,13 +505,7 @@
         	<fileset dir="system/cache" />
         </copy>
 		<copy todir="${dir.build}/wirebox/system/core" encoding="UTF-8" overwrite="true">
-        	<fileset dir="system/core">
-        		<include name="collections/"/>
-        		<include name="conversion/"/>
-        		<include name="util/"/>
-        		<include name="dynamic/"/>
-        		<include name="events/"/>
-        	</fileset>
+        	<fileset dir="system/core" />
         </copy>
 		<copy todir="${dir.build}/wirebox/system/logging" encoding="UTF-8" overwrite="true">
         	<fileset dir="system/logging" />

diff --git a/changelog.md b/changelog.md
@@ -9,6 +9,51 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### ColdBox HMVC
+
+#### Bug
+
+- [COLDBOX-1233](https://ortussolutions.atlassian.net/browse/COLDBOX-1233) Exception bean can't cast \`"i"\` to a number value
+
+#### New Feature
+
+- [COLDBOX-1229](https://ortussolutions.atlassian.net/browse/COLDBOX-1229) Added debug argument to ScheduleExecutor and Scheduler when creating tasks for consistency
+- [COLDBOX-1230](https://ortussolutions.atlassian.net/browse/COLDBOX-1230) Reorganized ScheduledTasks functions within the CFC into code groups and comments
+- [COLDBOX-1235](https://ortussolutions.atlassian.net/browse/COLDBOX-1235) New StringUtil.prettySQL method for usage in debugging and whoops reports
+- [COLDBOX-1238](https://ortussolutions.atlassian.net/browse/COLDBOX-1238) New testing matcher: toRedirectTo for easier testing against relocations
+- [COLDBOX-1239](https://ortussolutions.atlassian.net/browse/COLDBOX-1239) New REST convention for custom error handlers: \`on\{errorType\}Exception\(\)\`
+
+#### Improvements
+
+- [COLDBOX-1041](https://ortussolutions.atlassian.net/browse/COLDBOX-1041) Logging category in ColdBox scheduler is generic
+- [COLDBOX-1231](https://ortussolutions.atlassian.net/browse/COLDBOX-1231) Improve RestHandler Exception handler with on#ExceptionType#Exception\(\) convention
+- [COLDBOX-1234](https://ortussolutions.atlassian.net/browse/COLDBOX-1234) Account for null or empty incoming json to prettyjson output
+- [COLDBOX-1236](https://ortussolutions.atlassian.net/browse/COLDBOX-1236) Incorporate appName into the appHash to give more uniqueness to locks internally
+
+#### Tasks
+
+- [COLDBOX-1237](https://ortussolutions.atlassian.net/browse/COLDBOX-1237) Removal of Lucee RC tests - no longer needed
+
+### WireBox
+
+#### Bug
+
+- [WIREBOX-148](https://ortussolutions.atlassian.net/browse/WIREBOX-148) Several AOP and Internal WireBox methods not excluded from delegations
+- [WIREBOX-150](https://ortussolutions.atlassian.net/browse/WIREBOX-150) Wirebox standalone is missing delegates
+- [WIREBOX-151](https://ortussolutions.atlassian.net/browse/WIREBOX-151) Injections are null, sometimes
+- [WIREBOX-152](https://ortussolutions.atlassian.net/browse/WIREBOX-152) getEnv errors in Binder context
+- [WIREBOX-154](https://ortussolutions.atlassian.net/browse/WIREBOX-154) populateFromQuery delegate defaulting composeRelationships to true
+
+#### Improvement
+
+- [WIREBOX-147](https://ortussolutions.atlassian.net/browse/WIREBOX-147) Improve debug logging to not send the full memento on several debug operations
+
+#### Task
+
+- [WIREBOX-149](https://ortussolutions.atlassian.net/browse/WIREBOX-149) \`toWebservice\(\)\` is now deprecated
+
+* * *
+
 ## [7.0.0] - 2023-05-15
 
 ### ColdBox HMVC

diff --git a/readme.md b/readme.md
@@ -50,7 +50,6 @@ ColdBox *Hierarchical* MVC is the de-facto enterprise-level [HMVC](https://en.wi
 * [An extensive eco-system](https://forgebox.io)
 * Much More
 
-
 ## LTS Support
 
 For all ColdBox releases, updates are provided for 12 months and security fixes are provided for 2 years after the next major release.

diff --git a/[email protected] b/[email protected]
@@ -21,10 +21,10 @@
     "JVM":{
         "heapSize":"1024"
     },
-	"cfconfig": {
-		"file" : ".cfconfig.json"
-	},
-	"scripts" : {
-		"onServerInstall":"cfpm install caching,zip,orm,mysql,postgresql,sqlserver,document,feed,mail,debugger"
-	}
+    "cfconfig":{
+        "file":".cfconfig.json"
+    },
+    "scripts":{
+        "onServerInstall":"cfpm install caching,zip,orm,mysql,postgresql,sqlserver,document,feed,mail,debugger"
+    }
 }
diff --git a/[email protected] b/[email protected]
@@ -1,6 +1,6 @@
 {
     "app":{
-        "cfengine":"adobe@2023.0.0-beta.1",
+        "cfengine":"adobe@2023",
         "serverHomeDirectory":".engine/adobe2023"
     },
     "name":"coldbox-adobe@2023",

diff --git a/[email protected] b/[email protected]
@@ -1,6 +1,6 @@
 {
     "app":{
-        "cfengine":"lucee@5",
+        "cfengine":"lucee@5.4",
         "serverHomeDirectory":".engine/lucee5"
     },
     "name":"coldbox-lucee@5",
@@ -23,5 +23,8 @@
     },
     "cfconfig":{
         "file":".cfconfig.json"
+    },
+    "env":{
+        "lucee-extensions":"D062D72F-F8A2-46F0-8CBC91325B2F067B"
     }
 }
diff --git a/[email protected] b/[email protected]
diff --git a/[email protected] b/[email protected]
@@ -1,6 +1,6 @@
 {
     "app":{
-        "cfengine":"[email protected]BETA+346",
+        "cfengine":"[email protected]snapshot",
         "serverHomeDirectory":".engine/lucee6"
     },
     "name":"coldbox-lucee@6",
@@ -23,5 +23,8 @@
     },
     "cfconfig":{
         "file":".cfconfig.json"
+    },
+    "env":{
+        "lucee-extensions":"D062D72F-F8A2-46F0-8CBC91325B2F067B"
     }
 }
diff --git a/[email protected] b/[email protected]
@@ -21,7 +21,10 @@
     "JVM":{
         "heapSize":"1024"
     },
-	"cfconfig": {
-		"file" : ".cfconfig.json"
-	}
+    "cfconfig":{
+        "file":".cfconfig.json"
+    },
+    "env":{
+        "lucee-extensions":"D062D72F-F8A2-46F0-8CBC91325B2F067B"
+    }
 }
diff --git a/[email protected] b/[email protected]
@@ -21,7 +21,10 @@
     "JVM":{
         "heapSize":"1024"
     },
-	"cfconfig": {
-		"file" : ".cfconfig.json"
-	}
+    "cfconfig":{
+        "file":".cfconfig.json"
+    },
+    "env":{
+        "lucee-extensions":"D062D72F-F8A2-46F0-8CBC91325B2F067B,37C61C0A-5D7E-4256-8572639BE0CF5838 "
+    }
 }
diff --git a/system/RestHandler.cfc b/system/RestHandler.cfc
@@ -534,6 +534,20 @@ component extends="EventHandler" {
 	 * @exception      The thrown exception
 	 */
 	function onAnyOtherException( event, rc, prc, eventArguments, exception = {} ){
+		// Param due to inconsistencies with safe navigation operators in all CFML engines
+		param arguments.exception.type = "";
+
+		// Handle a convention of on{type}Exception() in your base handler
+		if (
+			len( arguments.exception.type ) && structKeyExists( this, "on#arguments.exception.type#Exception" ) && isCustomFunction(
+				this[ "on#arguments.exception.type#Exception" ]
+			)
+		) {
+			this[ "on#arguments.exception.type#Exception" ]( argumentCollection = arguments );
+			return;
+		}
+
+
 		// Log Exception
 		log.error(
 			"Error calling #arguments.event.getCurrentEvent()#: #arguments.exception.message# #arguments.exception.detail#",

diff --git a/system/async/executors/ScheduledExecutor.cfc b/system/async/executors/ScheduledExecutor.cfc
@@ -163,11 +163,13 @@ component extends="Executor" accessors="true" singleton {
 	 * Build out a new scheduled task representation. Calling this method does not mean that the task is executed.
 	 *
 	 * @name   The name of the task
+	 * @debug  Add debugging logs to System out, disabled by default
 	 * @task   The closure or cfc that represents the task (optional)
 	 * @method The method on the cfc to call, defaults to "run" (optional)
 	 */
 	ScheduledTask function newTask(
-		name = "task-#getName()#-#createUUID()#",
+		name  = "task-#getName()#-#createUUID()#",
+		debug = false,
 		task,
 		method = "run"
 	){