Boxlang compatibility

Author: jclausen

.cfconfig.json

@@ -1 +1,3 @@
-{}
+{
+    "debuggingEnabled" : true
+}

.env.template

@@ -0,0 +1,2 @@
+FR_ENABLE=false
+FR_LICENSE_KEY=

.gitignore

@@ -31,4 +31,5 @@ build/workbench/*
 changelog-latest.md
 
 # test environment secrets
-test-harness/.env
+test-harness/.env
+.env

models/SearchBuilder.cfc

@@ -1263,8 +1263,8 @@ component accessors="true" {
 		}
 
 		if ( !isNull( variables.sorting ) ) {
-			// we used a linked hashmap for sorting to maintain order
-			dsl[ "sort" ] = createObject( "java", "java.util.LinkedHashMap" ).init();
+			// we used an ordered struct so that the sort directives are in the order they were added
+			dsl[ "sort" ] = structNew( "ordered" );
 
 			for ( var sort in variables.sorting ) {
 				dsl.sort.putAll( sort );

models/io/HyperClient.cfc

@@ -503,7 +503,7 @@ component accessors="true" threadSafe singleton {
 		return structReduce(
 			arguments.index,
 			function( indexMap, key, value ){
-				indexMap.put( key, value );
+				indexMap[ key ] = value;
 				return indexMap;
 			},
 			{}

models/mappings/AbstractMapping.cfc

@@ -32,7 +32,7 @@ component accessors="true" {
 	}
 
 	function onMissingMethod( missingMethodName, missingMethodArguments ){
-		variables.parameters[ snakeCase( missingMethodName ) ] = missingMethodArguments[ 1 ];
+		variables.parameters[ variables.snakeCase( missingMethodName ) ] = missingMethodArguments[ 1 ];
 		return this;
 	}
 

models/migrations/Manager.cfc

@@ -110,14 +110,13 @@ component {
 						.term( "name", arguments.componentName )
 				);
 		} else {
-			var formatter = createObject( "java", "java.text.SimpleDateFormat" ).init( "yyyy-MM-dd'T'HH:mm:ssXXX" );
 			wirebox
 				.getInstance( "Document@cbelasticsearch" )
 				.new(
 					index      = variables.migrationsIndex,
 					properties = {
 						"name"         : arguments.componentName,
-						"migrationRan" : formatter.format( now() ).replace( "Z", "+00:00" )
+						"migrationRan" : dateTimeFormat( now(), "yyyy-mm-dd'T'HH:nn:ssZZ" )
 					}
 				)
 				.save( true );

models/util/Util.cfc

@@ -3,53 +3,6 @@ component accessors="true" singleton {
 	property name="appEnvironment"     inject="box:setting:environment";
 	property name="interceptorService" inject="coldbox:InterceptorService";
 
-	/**
-	 * Ensures a CF native struct is returned ( allowing for dot-notation )
-	 *
-	 * @memento A struct to ensure
-	 */
-	function ensureNativeStruct( required struct memento ){
-		// deserialize/serialize JSON is currently the only way to to ensure deeply nested items are converted without deep recursion
-		return deserializeJSON(
-			serializeJSON(
-				memento,
-				false,
-				listFindNoCase( "Lucee", server.coldfusion.productname ) ? "utf-8" : false
-			)
-		);
-	}
-
-	/**
-	 * Creates a new java.util.HashMap with an optional struct to populate
-	 *
-	 * @memento  a struct to populate the memento with
-	 */
-	function newHashMap( struct memento ){
-		var hashMap = createObject( "java", "java.util.HashMap" ).init();
-
-		if ( !isNull( arguments.memento ) ) {
-			// make sure we detach any references
-			hashMap.putAll( ensureBooleanCasting( duplicate( arguments.memento ) ) );
-			for ( var key in hashMap ) {
-				if ( isNull( hashMap[ key ] ) ) continue;
-
-				if ( isStruct( hashMap[ key ] ) && !isInstanceOf( hashMap[ key ], "java.util.HashMap" ) ) {
-					hashMap[ key ] = newHashMap( ensureBooleanCasting( hashMap[ key ] ) );
-				} else if ( isArray( hashMap[ key ] ) ) {
-					// scope this in for CF's compiler
-					var segment = hashMap[ key ];
-					segment.each( function( item, index ){
-						if ( isStruct( item ) && !isInstanceOf( item, "java.util.HashMap" ) ) {
-							hashMap[ key ][ index ] = newHashMap( ensureBooleanCasting( item ) );
-						}
-					} );
-				}
-			}
-		}
-
-		return hashMap;
-	}
-
 	/**
 	 * Workaround for Adobe 2018 metadata mutation bug with GSON: https://tracker.adobe.com/#/view/CF-4206423
 	 * @deprecated   As soon as the bug above is fixed

[email protected]

@@ -1,8 +1,13 @@
 {
     "app":{
-        "cfengine":"boxlang@be",
+        "cfengine":"boxlang@1.0.0-snapshot",
         "serverHomeDirectory":".engine/boxlang"
     },
+    "runwar":{
+        "console":{
+            "appenderLayout":"JSONTemplateLayout"
+        }
+    },
     "name":"cbelasticsearch-boxlang@1",
     "force":true,
     "openBrowser":false,
@@ -19,18 +24,16 @@
             "/moduleroot/cbelasticsearch":"./"
         }
     },
-    "JVM":{
-        "heapSize":"1024",
-        "javaVersion":"openjdk21_jdk",
-        "args":"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9999"
+    "fusionreactor":{
+        "enable":"${FR_ENABLE:false}",
+        "port":"8088",
+        "licenseKey":"${FR_LICENSE_KEY}"
     },
-    "cfconfig":{
-        "file":".cfconfig.json"
-    },
-    "env":{
-        "BOXLANG_DEBUG":true
+    "JVM":{
+        "javaVersion":"openjdk21_jdk_x64",
+        "args":"-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9999 -Dboxlang.debugMode=true"
     },
     "scripts":{
-        "onServerInitialInstall":"install bx-mail,bx-mysql,bx-derby,bx-compat-cfml@be,bx-unsafe-evaluate,bx-esapi --noSave"
+        "onServerInitialInstall":"install bx-compat-cfml@be,bx-esapi --noSave"
     }
 }

test-harness/tests/specs/unit/SearchBuilderTest.cfc

@@ -361,7 +361,7 @@ component extends="coldbox.system.testing.BaseTestCase" {
 			it( "Tests the sort() method by providing an array", function(){
 				var searchBuilder = variables.model.new( variables.testIndexName, "testdocs" );
 
-				var sort = [ { "lastName" : { "order" : "asc" } } ];
+				var sort = [ { "lastName" : { "order" : "asc" } }, { "firstName" : { "order" : "asc" } } ];
 
 				searchBuilder.sort( sort );
 
@@ -373,8 +373,8 @@ component extends="coldbox.system.testing.BaseTestCase" {
 				expect( dsl ).toHaveKey( "sort" );
 				expect( dsl.sort ).toBeStruct();
 				expect( dsl.sort ).toHaveKey( "lastName" );
+				expect( dsl.sort.keyArray().last() ).toBe( "firstName" );
 
-				expect( getMetadata( dsl.sort ).name ).toBe( "java.util.LinkedHashMap" );
 			} );
 
 			it( "Tests the sort() method by providing a simple SQL-type string", function(){

test-harness/tests/specs/unit/UtilTest.cfc

@@ -14,66 +14,6 @@ component extends="coldbox.system.testing.BaseTestCase" {
 
 	function run(){
 		describe( "Runs core util tests", function(){
-			it( "tests ensureNativeStruct", function(){
-				var ref = {
-					"foo"          : "bar",
-					"baz"          : { "foo" : "bar" },
-					"numeric"      : 1,
-					"booleanArray" : [
-						{ "foo" : true },
-						{ "foo" : false },
-						{ "foo" : "yes" },
-						{ "foo" : "no" }
-					]
-				};
-				var hashMap = variables.model.newHashMap( ref );
-
-				expect( function(){
-					var bar = hashMap.baz;
-				} ).toThrow();
-				expect( function(){
-					var bar = hashMap[ "baz" ].foo;
-				} ).toThrow();
-
-				debug( hashMap );
-
-				var nativeStruct = variables.model.ensureNativeStruct( hashMap );
-
-				debug( nativeStruct );
-
-				expect( nativeStruct.foo ).toBe( "bar" );
-				expect( nativeStruct.baz ).toBeStruct();
-				expect( nativeStruct.baz.foo ).toBe( "bar" );
-			} );
-
-			it( "tests newHashMap with no arguments", function(){
-				expect( getMetadata( variables.model.newHashMap() ).name ).toBe( "java.util.HashMap" );
-			} );
-
-			it( "tests newHashMap with a nested struct and arrays", function(){
-				var ref = {
-					"foo"     : "bar",
-					"baz"     : { "foo" : "bar" },
-					"bazooms" : [ { "foo" : "bar" }, { "foo" : "baz" } ]
-				};
-				var hashMap = variables.model.newHashMap( ref );
-
-				expect( getMetadata( hashMap ).name ).toBe( "java.util.HashMap" );
-
-				expect( function(){
-					var baz = hashMap.baz;
-				} ).toThrow();
-
-				expect( function(){
-					var baz = hashMap[ "baz" ].foo;
-				} ).toThrow();
-
-				expect( hashMap[ "foo" ] ).toBe( "bar" );
-				expect( hashMap[ "baz" ][ "foo" ] ).toBe( "bar" );
-				for ( var zoom in hashMap[ "bazooms" ] ) {
-					expect( getMetadata( zoom ).name ).toBe( "java.util.HashMap" );
-				}
-			} );
 
 			it( "tests handleResponseError with a simple error string", function(){
 				var mockResponse = getMockBox().createMock( className = "Hyper.models.HyperResponse" );