diff --git a/HarmonyCore.Test/Bridge/BasicBridge.dbl b/HarmonyCore.Test/Bridge/BasicBridge.dbl index bd733942..eba55ca0 100644 --- a/HarmonyCore.Test/Bridge/BasicBridge.dbl +++ b/HarmonyCore.Test/Bridge/BasicBridge.dbl @@ -174,20 +174,24 @@ namespace HarmonyCore.Test.Bridge Assert.AreEqual(7777777, mscAryTstIntResult.p1[3]) Assert.AreEqual(666666, mscAryTstIntResult.p1[4]) + ;Console.ReadKey() + data timeStart = DateTime.Now data i = 0 - for i from 1 thru 100 by 1 + data CData = new string('C', 65535) + data DData = new string('D', 65535) + for i from 1 thru 1000 by 1 begin - data passtringResult = await context.passstring(new passstring_Request() { p1 = new string('C', 65535), p3=new string('D', 65535) }) + data passtringResult = await context.passstring(new passstring_Request() { p1 = CData, p3=DData}) - Assert.AreEqual(new string('C', 65535), passtringResult.p2) - Assert.AreEqual(new string('D', 65535), passtringResult.p3) + Assert.AreEqual(CData, passtringResult.p2) + Assert.AreEqual(DData, passtringResult.p3) end data timeEnd = DateTime.Now data timeTaken = timeEnd - timeStart contextPool.ReturnContext(context) await contextPool.TrimPool(0) - Console.WriteLine("shutting down test") + Console.WriteLine("shutting down test {0}", timeTaken) endmethod public class ExternalCallContext extends DynamicCallProvider diff --git a/HarmonyCore/Context/ProcessDynamicCallConnection.dbl b/HarmonyCore/Context/ProcessDynamicCallConnection.dbl index e2eb6a5b..4c96bc63 100644 --- a/HarmonyCore/Context/ProcessDynamicCallConnection.dbl +++ b/HarmonyCore/Context/ProcessDynamicCallConnection.dbl @@ -109,7 +109,11 @@ namespace Harmony.Core.Context mTargetProcess.Exited += ProcessExit data result = JsonRpc.Attach(new StreamWrapper(mTargetProcess.StandardOutput, mTargetProcess.StandardInput), ^null) - result.TraceSource = new TraceSource("Client", SourceLevels.All) + if(DebugLogSession.Logging.Level == Harmony.Core.Interface.LogLevel.Trace) + begin + result.TraceSource = new TraceSource("Client", SourceLevels.All) + end + mreturn result endmethod diff --git a/HarmonyCore/Context/SSHDynamicCallConnection.dbl b/HarmonyCore/Context/SSHDynamicCallConnection.dbl index 7c87d6b6..a21c4da9 100644 --- a/HarmonyCore/Context/SSHDynamicCallConnection.dbl +++ b/HarmonyCore/Context/SSHDynamicCallConnection.dbl @@ -221,7 +221,10 @@ namespace Harmony.Core.Context data result = new JsonRPC(new HeaderDelimitedMessageHandler(streamWrapper, new JsonMessageFormatter(new UTF8Encoding(false)))) - result.TraceSource = new TraceSource("Client", SourceLevels.All) + if(DebugLogSession.Logging.Level == Harmony.Core.Interface.LogLevel.Trace) + begin + result.TraceSource = new TraceSource("Client", SourceLevels.All) + end result.StartListening() mreturn result endmethod diff --git a/Services.Test/UnitTests/CustomerTests.dbl b/Services.Test/UnitTests/CustomerTests.dbl index 4a9e4ead..a61b19b5 100644 --- a/Services.Test/UnitTests/CustomerTests.dbl +++ b/Services.Test/UnitTests/CustomerTests.dbl @@ -69,16 +69,16 @@ namespace Services.Test.UnitTests ;;------------------------------------------------------------ ;;Get all Customers and expand relation REL_CustomerNotes -; {TestMethod} -; {TestCategory("Customer Tests - Read All")} -; public method GetCustomers_Expand_REL_CustomerNotes, void -; proc -; data uri = "/odata/v1/Customers?$expand=REL_CustomerNotes" -; disposable data client = UnitTestEnvironment.Server.CreateClient() -; disposable data response = client.GetAsync(uri).Result -; data result = response.Content.ReadAsStringAsync().Result -; response.EnsureSuccessStatusCode() -; endmethod + {TestMethod} + {TestCategory("Customer Tests - Read All")} + public method GetCustomers_Expand_REL_CustomerNotes, void + proc + data uri = "/odata/v1/Customers?$expand=REL_CustomerNotes" + disposable data client = UnitTestEnvironment.Server.CreateClient() + disposable data response = client.GetAsync(uri).Result + data result = response.Content.ReadAsStringAsync().Result + response.EnsureSuccessStatusCode() + endmethod ;;------------------------------------------------------------ ;;Get all Customers and expand all relations @@ -142,17 +142,17 @@ namespace Services.Test.UnitTests ;;------------------------------------------------------------ ;;Get a single Customer by primary key and expand relation REL_CustomerNotes -; {TestMethod} -; {TestCategory("Customer Tests - Read by Primary Key")} -; public method GetCustomer_Expand_REL_CustomerNotes, void -; proc -; data client = UnitTestEnvironment.Server.CreateClient() -; data request = String.Format("/odata/v1/Customers(CustomerNumber={1})?$expand=REL_CustomerNotes","",TestConstants.GetCustomer_Expand_REL_CustomerNotes_CustomerNumber) -; data response = client.GetAsync(request).Result -; data result = response.Content.ReadAsStringAsync().Result -; response.EnsureSuccessStatusCode() -; data customer, @ODataCustomer, JsonConvert.DeserializeObject(result) -; endmethod + {TestMethod} + {TestCategory("Customer Tests - Read by Primary Key")} + public method GetCustomer_Expand_REL_CustomerNotes, void + proc + data client = UnitTestEnvironment.Server.CreateClient() + data request = String.Format("/odata/v1/Customers(CustomerNumber={1})?$expand=REL_CustomerNotes","",TestConstants.GetCustomer_Expand_REL_CustomerNotes_CustomerNumber) + data response = client.GetAsync(request).Result + data result = response.Content.ReadAsStringAsync().Result + response.EnsureSuccessStatusCode() + data customer, @ODataCustomer, JsonConvert.DeserializeObject(result) + endmethod ;;------------------------------------------------------------ ;;Get a single Customer by primary key and expand all relations diff --git a/Templates/TraditionalBridge/InterfaceMethodDispatchers.tpl b/Templates/TraditionalBridge/InterfaceMethodDispatchers.tpl index f412b6c0..ecacc579 100644 --- a/Templates/TraditionalBridge/InterfaceMethodDispatchers.tpl +++ b/Templates/TraditionalBridge/InterfaceMethodDispatchers.tpl @@ -50,6 +50,13 @@ import Harmony.TraditionalBridge import System.Collections import +.ifdef DBLV11 +import System.Text.Json +.define JSON_ELEMENT @JsonElement +.else +.define JSON_ELEMENT @JsonValue +.endc + namespace . @@ -82,12 +89,12 @@ namespace . protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition @@ -100,7 +107,7 @@ namespace . ;;Argument ( [*]memory handle collection of ArrayList collection of structure enum @ date time passed by REFERENCE passed by VALUE returned as DataTable) - argArray, @JsonArray + argArray, JSON_ELEMENT argHandle, D_HANDLE @@ -161,7 +168,7 @@ namespace . ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;There are no inbound arguments to process @@ -174,17 +181,17 @@ namespace . ;;Argument ( [*]memory handle collection of ArrayList collection of structure enum @ date time passed by REFERENCE passed by VALUE returned as DataTable) ;// - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[], ) - argArray = (@JsonArray)((@JsonObject)arguments.arrayValues[]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[], ) + argArray = arguments[].GetProperty("PassedValue") ;// - argHandle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*argArray.arrayValues.Count) + argHandle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*argArray.GetArrayLength()) argHandlePos = 1 dispatcher.UnwrapObjectCollection(^m(argHandle),argumentDefinition,argHandlePos,argArray) ;// - argHandle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*argArray.arrayValues.Count) + argHandle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*argArray.GetArrayLength()) argHandlePos = 1 dispatcher.UnwrapObjectCollection(^m(argHandle),argumentDefinition,argHandlePos,argArray) @@ -196,31 +203,31 @@ namespace . ;// - arg = dispatcher.GetText((@JsonObject)arguments.arrayValues[]) + arg = dispatcher.GetText(arguments[]) ;// - arg = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[]) + arg = dispatcher.GetDecimal(arguments[]) ;// - arg = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[]) + arg = dispatcher.GetImplied(arguments[]) ;// - arg = dispatcher.GetInt((@JsonObject)arguments.arrayValues[]) + arg = dispatcher.GetInt(arguments[]) ;// - arg = ()dispatcher.GetInt((@JsonObject)arguments.arrayValues[]) + arg = ()dispatcher.GetInt(arguments[]) ;// - arg = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[]) + arg = dispatcher.GetDecimal(arguments[]) ;// - arg = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[]) + arg = dispatcher.GetDecimal(arguments[]) ;// @@ -234,12 +241,12 @@ namespace . ;// - arg = dispatcher.GetText((@JsonObject)arguments.arrayValues[]) + arg = dispatcher.GetText(arguments[]) ;// ;;Structure argument. Get the data object then get the record from it - argDataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[3],mMetadata) + argDataObject = dispatcher.DeserializeObject(arguments[],mMetadata) arg = argDataObject.SynergyRecord ;// diff --git a/TraditionalBridge.Models/Models/Booleanstr.dbl b/TraditionalBridge.Models/Models/Booleanstr.dbl index e2c4293d..4b4874bc 100644 --- a/TraditionalBridge.Models/Models/Booleanstr.dbl +++ b/TraditionalBridge.Models/Models/Booleanstr.dbl @@ -289,6 +289,6 @@ namespace TraditionalBridge.Models endmethod .endregion -endclass + endclass endnamespace diff --git a/TraditionalBridge.Models/Models/Coercestructure.dbl b/TraditionalBridge.Models/Models/Coercestructure.dbl index 803fe8fa..5f0c6d52 100644 --- a/TraditionalBridge.Models/Models/Coercestructure.dbl +++ b/TraditionalBridge.Models/Models/Coercestructure.dbl @@ -215,7 +215,7 @@ namespace TraditionalBridge.Models ;;; ;;; ;;; - public property Nulldatetime, @Nullable + public property Nulldatetime, Nullable method get proc data formatString = "YYYYMMDD" @@ -472,6 +472,6 @@ namespace TraditionalBridge.Models endmethod .endregion -endclass + endclass endnamespace diff --git a/TraditionalBridge.Models/Models/Datatablestr.dbl b/TraditionalBridge.Models/Models/Datatablestr.dbl index ca3a2c4d..6729f959 100644 --- a/TraditionalBridge.Models/Models/Datatablestr.dbl +++ b/TraditionalBridge.Models/Models/Datatablestr.dbl @@ -185,6 +185,6 @@ namespace TraditionalBridge.Models endmethod .endregion -endclass + endclass endnamespace diff --git a/TraditionalBridge.Models/Models/Dateteblestr2.dbl b/TraditionalBridge.Models/Models/Dateteblestr2.dbl index 56ce0213..96af7053 100644 --- a/TraditionalBridge.Models/Models/Dateteblestr2.dbl +++ b/TraditionalBridge.Models/Models/Dateteblestr2.dbl @@ -200,6 +200,6 @@ namespace TraditionalBridge.Models endmethod .endregion -endclass + endclass endnamespace diff --git a/TraditionalBridge.Models/Models/Datetimeary.dbl b/TraditionalBridge.Models/Models/Datetimeary.dbl index 39ce1092..a8a5ac9a 100644 --- a/TraditionalBridge.Models/Models/Datetimeary.dbl +++ b/TraditionalBridge.Models/Models/Datetimeary.dbl @@ -413,6 +413,6 @@ namespace TraditionalBridge.Models endmethod .endregion -endclass + endclass endnamespace diff --git a/TraditionalBridge.Models/Models/Datetimestr.dbl b/TraditionalBridge.Models/Models/Datetimestr.dbl index 269769dc..663273e1 100644 --- a/TraditionalBridge.Models/Models/Datetimestr.dbl +++ b/TraditionalBridge.Models/Models/Datetimestr.dbl @@ -202,6 +202,6 @@ namespace TraditionalBridge.Models endmethod .endregion -endclass + endclass endnamespace diff --git a/TraditionalBridge.Models/Models/Dnetdatetime.dbl b/TraditionalBridge.Models/Models/Dnetdatetime.dbl index 59ab4785..64f9a766 100644 --- a/TraditionalBridge.Models/Models/Dnetdatetime.dbl +++ b/TraditionalBridge.Models/Models/Dnetdatetime.dbl @@ -125,6 +125,6 @@ namespace TraditionalBridge.Models endmethod .endregion -endclass + endclass endnamespace diff --git a/TraditionalBridge.Models/Models/Nulldtary.dbl b/TraditionalBridge.Models/Models/Nulldtary.dbl index 3cee0888..2c4aaf5b 100644 --- a/TraditionalBridge.Models/Models/Nulldtary.dbl +++ b/TraditionalBridge.Models/Models/Nulldtary.dbl @@ -64,7 +64,7 @@ namespace TraditionalBridge.Models ;;; ;;; Date 8 YYYYMMDD 1 ;;; - public property NdtsDt81, @Nullable + public property NdtsDt81, Nullable method get proc data formatString = "YYYYMMDD" @@ -80,7 +80,7 @@ namespace TraditionalBridge.Models ;;; ;;; Date 8 YYYYMMDD 2 ;;; - public property NdtsDt82, @Nullable + public property NdtsDt82, Nullable method get proc data formatString = "YYYYMMDD" @@ -96,7 +96,7 @@ namespace TraditionalBridge.Models ;;; ;;; Date 8 YYYYMMDD 3 ;;; - public property NdtsDt83, @Nullable + public property NdtsDt83, Nullable method get proc data formatString = "YYYYMMDD" @@ -112,7 +112,7 @@ namespace TraditionalBridge.Models ;;; ;;; Date 6 YYMMDD 1 ;;; - public property NdtsDt61, @Nullable + public property NdtsDt61, Nullable method get proc data formatString = "YYYYMMDD" @@ -130,7 +130,7 @@ namespace TraditionalBridge.Models ;;; ;;; Date 6 YYMMDD 2 ;;; - public property NdtsDt62, @Nullable + public property NdtsDt62, Nullable method get proc data formatString = "YYYYMMDD" @@ -148,7 +148,7 @@ namespace TraditionalBridge.Models ;;; ;;; Date 6 YYMMDD 3 ;;; - public property NdtsDt63, @Nullable + public property NdtsDt63, Nullable method get proc data formatString = "YYYYMMDD" @@ -166,7 +166,7 @@ namespace TraditionalBridge.Models ;;; ;;; Date 7 YYYYJJJ 1 ;;; - public property NdtsDt71, @Nullable + public property NdtsDt71, Nullable method get proc data formatString = "YYYYMMDD" @@ -182,7 +182,7 @@ namespace TraditionalBridge.Models ;;; ;;; Date 7 YYYYJJJ 2 ;;; - public property NdtsDt72, @Nullable + public property NdtsDt72, Nullable method get proc data formatString = "YYYYMMDD" @@ -198,7 +198,7 @@ namespace TraditionalBridge.Models ;;; ;;; Date 7 YYYYJJJ 3 ;;; - public property NdtsDt73, @Nullable + public property NdtsDt73, Nullable method get proc data formatString = "YYYYMMDD" @@ -214,7 +214,7 @@ namespace TraditionalBridge.Models ;;; ;;; Date 5 YYJJJ 1 ;;; - public property NdtsDt51, @Nullable + public property NdtsDt51, Nullable method get proc data formatString = "YYYYMMDD" @@ -230,7 +230,7 @@ namespace TraditionalBridge.Models ;;; ;;; Date 5 YYJJJ 2 ;;; - public property NdtsDt52, @Nullable + public property NdtsDt52, Nullable method get proc data formatString = "YYYYMMDD" @@ -246,7 +246,7 @@ namespace TraditionalBridge.Models ;;; ;;; Date 5 YYJJJ 3 ;;; - public property NdtsDt53, @Nullable + public property NdtsDt53, Nullable method get proc data formatString = "YYYYMMDD" @@ -262,7 +262,7 @@ namespace TraditionalBridge.Models ;;; ;;; Time 6 HHMMSS 1 ;;; - public property NdtsTm61, @Nullable + public property NdtsTm61, Nullable method get proc data formatString = "YYYYMMDD" @@ -278,7 +278,7 @@ namespace TraditionalBridge.Models ;;; ;;; Time 6 HHMMSS 2 ;;; - public property NdtsTm62, @Nullable + public property NdtsTm62, Nullable method get proc data formatString = "YYYYMMDD" @@ -294,7 +294,7 @@ namespace TraditionalBridge.Models ;;; ;;; Time 6 HHMMSS 3 ;;; - public property NdtsTm63, @Nullable + public property NdtsTm63, Nullable method get proc data formatString = "YYYYMMDD" @@ -310,7 +310,7 @@ namespace TraditionalBridge.Models ;;; ;;; Time 4 HHMM 1 ;;; - public property NdtsTm41, @Nullable + public property NdtsTm41, Nullable method get proc data formatString = "YYYYMMDD" @@ -326,7 +326,7 @@ namespace TraditionalBridge.Models ;;; ;;; Time 4 HHMM 2 ;;; - public property NdtsTm42, @Nullable + public property NdtsTm42, Nullable method get proc data formatString = "YYYYMMDD" @@ -342,7 +342,7 @@ namespace TraditionalBridge.Models ;;; ;;; Time 4 HHMM 3 ;;; - public property NdtsTm43, @Nullable + public property NdtsTm43, Nullable method get proc data formatString = "YYYYMMDD" @@ -419,6 +419,6 @@ namespace TraditionalBridge.Models endmethod .endregion -endclass + endclass endnamespace diff --git a/TraditionalBridge.Models/Models/Nulldtstr.dbl b/TraditionalBridge.Models/Models/Nulldtstr.dbl index fe09dc84..5e4774ee 100644 --- a/TraditionalBridge.Models/Models/Nulldtstr.dbl +++ b/TraditionalBridge.Models/Models/Nulldtstr.dbl @@ -79,7 +79,7 @@ namespace TraditionalBridge.Models ;;; ;;; ;;; - public property NdtDate8, @Nullable + public property NdtDate8, Nullable method get proc data formatString = "YYYYMMDD" @@ -95,7 +95,7 @@ namespace TraditionalBridge.Models ;;; ;;; ;;; - public property NdtDate6, @Nullable + public property NdtDate6, Nullable method get proc data formatString = "YYYYMMDD" @@ -113,7 +113,7 @@ namespace TraditionalBridge.Models ;;; ;;; ;;; - public property NdtTime6, @Nullable + public property NdtTime6, Nullable method get proc data formatString = "YYYYMMDD" @@ -129,7 +129,7 @@ namespace TraditionalBridge.Models ;;; ;;; ;;; - public property NdtTime4, @Nullable + public property NdtTime4, Nullable method get proc data formatString = "YYYYMMDD" @@ -206,6 +206,6 @@ namespace TraditionalBridge.Models endmethod .endregion -endclass + endclass endnamespace diff --git a/TraditionalBridge.Models/Models/Strtest1.dbl b/TraditionalBridge.Models/Models/Strtest1.dbl index 9f2d8794..6a9641f3 100644 --- a/TraditionalBridge.Models/Models/Strtest1.dbl +++ b/TraditionalBridge.Models/Models/Strtest1.dbl @@ -200,6 +200,6 @@ namespace TraditionalBridge.Models endmethod .endregion -endclass + endclass endnamespace diff --git a/TraditionalBridge.Models/Models/Strtest12.dbl b/TraditionalBridge.Models/Models/Strtest12.dbl index 51854417..30591907 100644 --- a/TraditionalBridge.Models/Models/Strtest12.dbl +++ b/TraditionalBridge.Models/Models/Strtest12.dbl @@ -245,6 +245,6 @@ namespace TraditionalBridge.Models endmethod .endregion -endclass + endclass endnamespace diff --git a/TraditionalBridge.Models/Models/Strtest14.dbl b/TraditionalBridge.Models/Models/Strtest14.dbl index 687da461..236f9fc4 100644 --- a/TraditionalBridge.Models/Models/Strtest14.dbl +++ b/TraditionalBridge.Models/Models/Strtest14.dbl @@ -260,6 +260,6 @@ namespace TraditionalBridge.Models endmethod .endregion -endclass + endclass endnamespace diff --git a/TraditionalBridge.Models/Models/Strtest2.dbl b/TraditionalBridge.Models/Models/Strtest2.dbl index e43fb791..db3b46d9 100644 --- a/TraditionalBridge.Models/Models/Strtest2.dbl +++ b/TraditionalBridge.Models/Models/Strtest2.dbl @@ -260,6 +260,6 @@ namespace TraditionalBridge.Models endmethod .endregion -endclass + endclass endnamespace diff --git a/TraditionalBridge.Models/Models/Strtest3.dbl b/TraditionalBridge.Models/Models/Strtest3.dbl index 060941a8..43aa159b 100644 --- a/TraditionalBridge.Models/Models/Strtest3.dbl +++ b/TraditionalBridge.Models/Models/Strtest3.dbl @@ -215,6 +215,6 @@ namespace TraditionalBridge.Models endmethod .endregion -endclass + endclass endnamespace diff --git a/TraditionalBridge.Models/Models/Strtest4.dbl b/TraditionalBridge.Models/Models/Strtest4.dbl index dfa8d4ea..27440b0b 100644 --- a/TraditionalBridge.Models/Models/Strtest4.dbl +++ b/TraditionalBridge.Models/Models/Strtest4.dbl @@ -245,6 +245,6 @@ namespace TraditionalBridge.Models endmethod .endregion -endclass + endclass endnamespace diff --git a/TraditionalBridge.Models/Models/Structuretest.dbl b/TraditionalBridge.Models/Models/Structuretest.dbl index 89044bda..f809ec4f 100644 --- a/TraditionalBridge.Models/Models/Structuretest.dbl +++ b/TraditionalBridge.Models/Models/Structuretest.dbl @@ -170,6 +170,6 @@ namespace TraditionalBridge.Models endmethod .endregion -endclass + endclass endnamespace diff --git a/TraditionalBridge.Models/Models/Timekey.dbl b/TraditionalBridge.Models/Models/Timekey.dbl index bf7a1ba4..131cf0e3 100644 --- a/TraditionalBridge.Models/Models/Timekey.dbl +++ b/TraditionalBridge.Models/Models/Timekey.dbl @@ -154,6 +154,6 @@ namespace TraditionalBridge.Models endmethod .endregion -endclass + endclass endnamespace diff --git a/TraditionalBridge.Models/Models/Userdates.dbl b/TraditionalBridge.Models/Models/Userdates.dbl index c9f3a003..9bee2472 100644 --- a/TraditionalBridge.Models/Models/Userdates.dbl +++ b/TraditionalBridge.Models/Models/Userdates.dbl @@ -140,6 +140,6 @@ namespace TraditionalBridge.Models endmethod .endregion -endclass + endclass endnamespace diff --git a/TraditionalBridge.Test/Dispatcher/ArbitrarioDispatcher.dbl b/TraditionalBridge.Test/Dispatcher/ArbitrarioDispatcher.dbl index f67e3667..40f8464e 100644 --- a/TraditionalBridge.Test/Dispatcher/ArbitrarioDispatcher.dbl +++ b/TraditionalBridge.Test/Dispatcher/ArbitrarioDispatcher.dbl @@ -4,17 +4,24 @@ import Harmony.TraditionalBridge import Json import TraditionalBridge.Test.Models +.ifdef DBLV11 +import System.Text.Json +.define JSON_ELEMENT @JsonElement +.else +.define JSON_ELEMENT @JsonValue +.endc + namespace TraditionalBridge.Test.Dispatcher public class ArbitrarioDispatcher extends RoutineStub protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record - arguments, @JsonArray + arguments, JSON_ELEMENT returnValue, int classInstance, @arbitrario arg4, @ArrayList @@ -25,16 +32,16 @@ namespace TraditionalBridge.Test.Dispatcher ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;------------------------------------------------------------ ;; Call the underlying routine - arg5 = dispatcher.UnwrapObjectCollection(dispatcher.GetArray((@JsonObject)arguments.arrayValues[5])) + arg5 = dispatcher.UnwrapObjectCollection(dispatcher.GetArray(arguments[5])) returnValue = classInstance.MethodWithParameters( - & dispatcher.GetInt((@JsonObject)arguments.arrayValues[1]), - & dispatcher.GetText((@JsonObject)arguments.arrayValues[2]), - & dispatcher.UnwrapStringArray(dispatcher.GetArray((@JsonObject)arguments.arrayValues[3])), + & dispatcher.GetInt(arguments[1]), + & dispatcher.GetText(arguments[2]), + & dispatcher.UnwrapStringArray(dispatcher.GetArray(arguments[3])), & arg4, & arg5) @@ -49,16 +56,16 @@ namespace TraditionalBridge.Test.Dispatcher protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record - arguments, @JsonArray + arguments, JSON_ELEMENT returnValue, int classInstance, @arbitrario - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1, [#]@Customer - arg1Obj, [#]@DataObjectBase + arg1Obj, [#]@DataObjectBase arg2, @ArrayList arg3, @Customer arg4, @Customer @@ -75,29 +82,29 @@ namespace TraditionalBridge.Test.Dispatcher ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;------------------------------------------------------------ ;; Call the underlying routine - arg1Array = dispatcher.GetArray((@JsonObject)arguments.arrayValues[1]) - arg1 = new Customer[arg1Array.arrayValues.Count] + arg1Array = dispatcher.GetArray(arguments[1]) + arg1 = new Customer[arg1Array.GetArrayLength()] dispatcher.UnwrapObjectCollection(arg1Array, arg1, false, DataObjectMetadataBase.LookupType("CUSTOMER"), strCustomerBuffer, FieldDataType.DataObjectField, ^size(strCustomer), 0) arg2 = new ArrayList() - dispatcher.UnwrapObjectCollection(dispatcher.GetArray((@JsonObject)arguments.arrayValues[2]), arg2, false, DataObjectMetadataBase.LookupType("CUSTOMER"), strCustomerBuffer, FieldDataType.DataObjectField, ^size(strCustomer), 0) + dispatcher.UnwrapObjectCollection(dispatcher.GetArray(arguments[2]), arg2, false, DataObjectMetadataBase.LookupType("CUSTOMER"), strCustomerBuffer, FieldDataType.DataObjectField, ^size(strCustomer), 0) - arg3 = (@Customer)dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[3], DataObjectMetadataBase.LookupType("CUSTOMER")) - arg4 = (@Customer)dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[4], DataObjectMetadataBase.LookupType("CUSTOMER")) + arg3 = (@Customer)dispatcher.DeserializeObject(arguments[3], DataObjectMetadataBase.LookupType("CUSTOMER")) + arg4 = (@Customer)dispatcher.DeserializeObject(arguments[4], DataObjectMetadataBase.LookupType("CUSTOMER")) - arg5Def = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], ^size(strCustomer)) + arg5Def = dispatcher.GetArgumentDataDefForCollection(arguments[1], ^size(strCustomer)) arg5BufPos = 1 - arg5Handle = %mem_proc(DM_ALLOC, ^size(strCustomer) * arg1Array.arrayValues.Count) + arg5Handle = %mem_proc(DM_ALLOC, ^size(strCustomer) * arg1Array.GetArrayLength()) dispatcher.UnwrapObjectCollection(arg5Handle, arg5Def, arg5BufPos, arg1Array) - arg6 = new TraditionalBridge.Test.Models.strCustomer[arg1Array.arrayValues.Count] + arg6 = new TraditionalBridge.Test.Models.strCustomer[arg1Array.GetArrayLength()] dispatcher.UnwrapObjectCollection(arg1Array, arg6, false, DataObjectMetadataBase.LookupType("CUSTOMER"), strCustomerBuffer, FieldDataType.AlphaField, ^size(strCustomer), 0) arg7 = new ArrayList() - dispatcher.UnwrapObjectCollection(dispatcher.GetArray((@JsonObject)arguments.arrayValues[2]), arg7, false, DataObjectMetadataBase.LookupType("CUSTOMER"), strCustomerBuffer, FieldDataType.AlphaField, ^size(strCustomer), 0) + dispatcher.UnwrapObjectCollection(dispatcher.GetArray(arguments[2]), arg7, false, DataObjectMetadataBase.LookupType("CUSTOMER"), strCustomerBuffer, FieldDataType.AlphaField, ^size(strCustomer), 0) returnValue = classInstance.MethodWithStructures(arg1, arg2, arg3, arg4.SynergyRecord, ^m(strCustomer, arg5Handle), arg6, arg7) arg1Obj = new DataObjectBase[arg1.Length] @@ -128,11 +135,11 @@ namespace TraditionalBridge.Test.Dispatcher protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record - arguments, @JsonArray + arguments, JSON_ELEMENT arg1, a4 arg2, a24 arg2Passed, boolean @@ -145,17 +152,17 @@ namespace TraditionalBridge.Test.Dispatcher ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;------------------------------------------------------------ ;; Call the underlying routine RCBInit("arbitrary_optional", 4, mRcbid) try begin - RCBArg(1, (@JsonObject)arguments.arrayValues[1], FieldDataType.IntegerField, arg1, mRcbid, 0) - RCBArg(2, (@JsonObject)arguments.arrayValues[2], FieldDataType.AlphaField, arg2, mRcbid, 0, arg2Passed) - RCBArg(3, (@JsonObject)arguments.arrayValues[3], FieldDataType.AlphaField, arg3, mRcbid, 0, arg3Passed) - RCBArg(4, (@JsonObject)arguments.arrayValues[4], FieldDataType.DecimalField, arg4, mRcbid, 0, arg4Passed) + RCBArg(1, arguments[1], FieldDataType.IntegerField, arg1, mRcbid, 0) + RCBArg(2, arguments[2], FieldDataType.AlphaField, arg2, mRcbid, 0, arg2Passed) + RCBArg(3, arguments[3], FieldDataType.AlphaField, arg3, mRcbid, 0, arg3Passed) + RCBArg(4, arguments[4], FieldDataType.DecimalField, arg4, mRcbid, 0, arg4Passed) rcb_call(mRcbid) diff --git a/TraditionalBridge.Test/MethodDispatchers/AutoTimeMethodDispachers.dbl b/TraditionalBridge.Test/MethodDispatchers/AutoTimeMethodDispachers.dbl index 1c577003..dff2c44e 100644 --- a/TraditionalBridge.Test/MethodDispatchers/AutoTimeMethodDispachers.dbl +++ b/TraditionalBridge.Test/MethodDispatchers/AutoTimeMethodDispachers.dbl @@ -15,6 +15,13 @@ import Harmony.TraditionalBridge import System.Collections import TraditionalBridge.Test.Models +.ifdef DBLV11 +import System.Text.Json +.define JSON_ELEMENT @JsonElement +.else +.define JSON_ELEMENT @JsonValue +.endc + namespace TraditionalBridge.Test.AutoTime @@ -34,16 +41,16 @@ namespace TraditionalBridge.Test.AutoTime protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN TIMEKEY ArrayList collection of structure @Timekey) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1, @ArrayList endrecord @@ -53,11 +60,11 @@ namespace TraditionalBridge.Test.AutoTime ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN TIMEKEY ArrayList collection of structure @Timekey) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 50) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 50) + arg1Array = arguments[1].GetProperty("PassedValue") arg1 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg1Array,arg1) @@ -85,12 +92,12 @@ namespace TraditionalBridge.Test.AutoTime protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT TIMEKEY ArrayList collection of structure @Timekey) @@ -134,16 +141,16 @@ namespace TraditionalBridge.Test.AutoTime protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT TIMEKEY [*]structure @Timekey) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1Handle, D_HANDLE arg1HandlePos, int endrecord @@ -159,12 +166,12 @@ namespace TraditionalBridge.Test.AutoTime ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT TIMEKEY [*]structure @Timekey) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 50) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") - arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 50) + arg1Array = arguments[1].GetProperty("PassedValue") + arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.GetArrayLength()) arg1HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg1Handle),argumentDefinition,arg1HandlePos,arg1Array) @@ -197,12 +204,12 @@ namespace TraditionalBridge.Test.AutoTime protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT TIMEKEY structure @Timekey) @@ -216,11 +223,11 @@ namespace TraditionalBridge.Test.AutoTime ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT TIMEKEY structure @Timekey) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mTimekeyMetadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mTimekeyMetadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -253,12 +260,12 @@ namespace TraditionalBridge.Test.AutoTime protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN TIMEKEY structure @Timekey) @@ -272,11 +279,11 @@ namespace TraditionalBridge.Test.AutoTime ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN TIMEKEY structure @Timekey) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mTimekeyMetadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mTimekeyMetadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -303,12 +310,12 @@ namespace TraditionalBridge.Test.AutoTime protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT TIMEKEY structure @Timekey) diff --git a/TraditionalBridge.Test/MethodDispatchers/BinaryTransferMethodDispachers.dbl b/TraditionalBridge.Test/MethodDispatchers/BinaryTransferMethodDispachers.dbl index 80b2f597..b8eabee7 100644 --- a/TraditionalBridge.Test/MethodDispatchers/BinaryTransferMethodDispachers.dbl +++ b/TraditionalBridge.Test/MethodDispatchers/BinaryTransferMethodDispachers.dbl @@ -15,6 +15,13 @@ import Harmony.TraditionalBridge import System.Collections import TraditionalBridge.Test.Models +.ifdef DBLV11 +import System.Text.Json +.define JSON_ELEMENT @JsonElement +.else +.define JSON_ELEMENT @JsonValue +.endc + namespace TraditionalBridge.Test.BinaryTransfer @@ -32,12 +39,12 @@ namespace TraditionalBridge.Test.BinaryTransfer protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition endrecord @@ -72,12 +79,12 @@ namespace TraditionalBridge.Test.BinaryTransfer protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition endrecord @@ -114,12 +121,12 @@ namespace TraditionalBridge.Test.BinaryTransfer protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT grfat structure @Grfatest) @@ -165,12 +172,12 @@ namespace TraditionalBridge.Test.BinaryTransfer protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT myarraylist ArrayList collection of structure @Teststruct) @@ -212,12 +219,12 @@ namespace TraditionalBridge.Test.BinaryTransfer protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT mybyte I1) @@ -259,12 +266,12 @@ namespace TraditionalBridge.Test.BinaryTransfer protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT amybyte [*]I1) @@ -314,12 +321,12 @@ namespace TraditionalBridge.Test.BinaryTransfer protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT amyintegers structure @Integer) @@ -365,12 +372,12 @@ namespace TraditionalBridge.Test.BinaryTransfer protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT amyintegers [*]structure @Integer) @@ -418,12 +425,12 @@ namespace TraditionalBridge.Test.BinaryTransfer protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT myuint I4) @@ -465,12 +472,12 @@ namespace TraditionalBridge.Test.BinaryTransfer protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT amyuint [*]I4) @@ -518,12 +525,12 @@ namespace TraditionalBridge.Test.BinaryTransfer protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT myushort I2) @@ -565,12 +572,12 @@ namespace TraditionalBridge.Test.BinaryTransfer protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT amyushort [*]I2) @@ -618,16 +625,16 @@ namespace TraditionalBridge.Test.BinaryTransfer protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN amybyte [*]I1) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1Handle, D_HANDLE arg1HandlePos, int endrecord @@ -643,12 +650,12 @@ namespace TraditionalBridge.Test.BinaryTransfer ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN amybyte [*]I1) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 1) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") - arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 1) + arg1Array = arguments[1].GetProperty("PassedValue") + arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.GetArrayLength()) arg1HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg1Handle),argumentDefinition,arg1HandlePos,arg1Array) @@ -674,16 +681,16 @@ namespace TraditionalBridge.Test.BinaryTransfer protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN amyushort [*]I2) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1Handle, D_HANDLE arg1HandlePos, int endrecord @@ -699,12 +706,12 @@ namespace TraditionalBridge.Test.BinaryTransfer ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN amyushort [*]I2) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 2) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") - arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 2) + arg1Array = arguments[1].GetProperty("PassedValue") + arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.GetArrayLength()) arg1HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg1Handle),argumentDefinition,arg1HandlePos,arg1Array) @@ -732,12 +739,12 @@ namespace TraditionalBridge.Test.BinaryTransfer protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN grfa structure @Grfatest) @@ -751,11 +758,11 @@ namespace TraditionalBridge.Test.BinaryTransfer ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN grfa structure @Grfatest) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mGrfatestMetadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mGrfatestMetadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ diff --git a/TraditionalBridge.Test/MethodDispatchers/EncryptMethodDispachers.dbl b/TraditionalBridge.Test/MethodDispatchers/EncryptMethodDispachers.dbl index 9530f7f3..3c738730 100644 --- a/TraditionalBridge.Test/MethodDispatchers/EncryptMethodDispachers.dbl +++ b/TraditionalBridge.Test/MethodDispatchers/EncryptMethodDispachers.dbl @@ -15,6 +15,13 @@ import Harmony.TraditionalBridge import System.Collections import TraditionalBridge.Test.Models +.ifdef DBLV11 +import System.Text.Json +.define JSON_ELEMENT @JsonElement +.else +.define JSON_ELEMENT @JsonValue +.endc + namespace TraditionalBridge.Test.Encrypt @@ -32,12 +39,12 @@ namespace TraditionalBridge.Test.Encrypt protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL IN p1 A50) @@ -56,19 +63,19 @@ namespace TraditionalBridge.Test.Encrypt ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL IN p1 A50) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 2 (OPTIONAL IN p2 D5) - arg2 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetDecimal(arguments[2]) ;;Argument 3 (OPTIONAL IN p3 D10.3) - arg3 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetImplied(arguments[3]) ;;Argument 4 (OPTIONAL IN p4 I4) - arg4 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[4]) + arg4 = dispatcher.GetInt(arguments[4]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -94,12 +101,12 @@ namespace TraditionalBridge.Test.Encrypt protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT strtest3 structure @Strtest3) @@ -113,11 +120,11 @@ namespace TraditionalBridge.Test.Encrypt ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT strtest3 structure @Strtest3) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mStrtest3Metadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mStrtest3Metadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -150,12 +157,12 @@ namespace TraditionalBridge.Test.Encrypt protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT strtest4 structure @Strtest4) @@ -169,11 +176,11 @@ namespace TraditionalBridge.Test.Encrypt ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT strtest4 structure @Strtest4) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mStrtest4Metadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mStrtest4Metadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -208,12 +215,12 @@ namespace TraditionalBridge.Test.Encrypt protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT strtest1 structure @Strtest1) @@ -230,16 +237,16 @@ namespace TraditionalBridge.Test.Encrypt ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT strtest1 structure @Strtest1) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mStrtest1Metadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mStrtest1Metadata) arg1 = arg1DataObject.SynergyRecord ;;Argument 2 (REQUIRED INOUT strtest3 structure @Strtest3) ;;Structure argument. Get the data object then get the record from it - arg2DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[2],mStrtest3Metadata) + arg2DataObject = dispatcher.DeserializeObject(arguments[2],mStrtest3Metadata) arg2 = arg2DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -276,12 +283,12 @@ namespace TraditionalBridge.Test.Encrypt protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL INOUT p1 D12.2) @@ -312,37 +319,37 @@ namespace TraditionalBridge.Test.Encrypt ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL INOUT p1 D12.2) - arg1 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetImplied(arguments[1]) ;;Argument 2 (OPTIONAL INOUT p2 D10.5) - arg2 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetImplied(arguments[2]) ;;Argument 3 (OPTIONAL IN p3 D10.5) - arg3 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetImplied(arguments[3]) ;;Argument 4 (OPTIONAL IN p4 D10.2) - arg4 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[4]) + arg4 = dispatcher.GetImplied(arguments[4]) ;;Argument 5 (OPTIONAL IN p5 D10) - arg5 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[5]) + arg5 = dispatcher.GetDecimal(arguments[5]) ;;Argument 6 (OPTIONAL INOUT p6 D7.7) - arg6 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[6]) + arg6 = dispatcher.GetImplied(arguments[6]) ;;Argument 7 (OPTIONAL IN p7 D5.4) - arg7 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[7]) + arg7 = dispatcher.GetImplied(arguments[7]) ;;Argument 8 (OPTIONAL INOUT p8 D8) - arg8 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[8]) + arg8 = dispatcher.GetDecimal(arguments[8]) ;;Argument 9 (OPTIONAL INOUT p9 D7.1) - arg9 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[9]) + arg9 = dispatcher.GetImplied(arguments[9]) ;;Argument 10 (OPTIONAL IN p10 D9) - arg10 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[10]) + arg10 = dispatcher.GetDecimal(arguments[10]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -391,12 +398,12 @@ namespace TraditionalBridge.Test.Encrypt protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL INOUT p1 A30) @@ -415,19 +422,19 @@ namespace TraditionalBridge.Test.Encrypt ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL INOUT p1 A30) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 2 (OPTIONAL INOUT p2 A30) - arg2 = dispatcher.GetText((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetText(arguments[2]) ;;Argument 3 (OPTIONAL INOUT p3 A10) - arg3 = dispatcher.GetText((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetText(arguments[3]) ;;Argument 4 (OPTIONAL INOUT p4 A50) - arg4 = dispatcher.GetText((@JsonObject)arguments.arrayValues[4]) + arg4 = dispatcher.GetText(arguments[4]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -471,12 +478,12 @@ namespace TraditionalBridge.Test.Encrypt protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL INOUT p1 A5) @@ -490,19 +497,19 @@ namespace TraditionalBridge.Test.Encrypt ;;Argument 5 (OPTIONAL INOUT p5 D6.3) arg5, d6.3 ;;Argument 6 (OPTIONAL INOUT p6 [*]D5) - arg6Array, @JsonArray + arg6Array, JSON_ELEMENT arg6Handle, D_HANDLE arg6HandlePos, int ;;Argument 7 (OPTIONAL INOUT p7 [*]A20) - arg7Array, @JsonArray + arg7Array, JSON_ELEMENT arg7Handle, D_HANDLE arg7HandlePos, int ;;Argument 8 (OPTIONAL INOUT p8 [*]D10.3) - arg8Array, @JsonArray + arg8Array, JSON_ELEMENT arg8Handle, D_HANDLE arg8HandlePos, int ;;Argument 9 (OPTIONAL INOUT p9 [*]I4) - arg9Array, @JsonArray + arg9Array, JSON_ELEMENT arg9Handle, D_HANDLE arg9HandlePos, int endrecord @@ -533,48 +540,48 @@ namespace TraditionalBridge.Test.Encrypt ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL INOUT p1 A5) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 2 (OPTIONAL INOUT p2 I4) - arg2 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetInt(arguments[2]) ;;Argument 3 (OPTIONAL INOUT p3 D6) - arg3 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetDecimal(arguments[3]) ;;Argument 4 (OPTIONAL IN p4 A5) - arg4 = dispatcher.GetText((@JsonObject)arguments.arrayValues[4]) + arg4 = dispatcher.GetText(arguments[4]) ;;Argument 5 (OPTIONAL INOUT p5 D6.3) - arg5 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[5]) + arg5 = dispatcher.GetImplied(arguments[5]) ;;Argument 6 (OPTIONAL INOUT p6 [*]D5) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[6], 5) - arg6Array = (@JsonArray)((@JsonObject)arguments.arrayValues[6]).GetProperty("PassedValue") - arg6Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg6Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[6], 5) + arg6Array = arguments[6].GetProperty("PassedValue") + arg6Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg6Array.GetArrayLength()) arg6HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg6Handle),argumentDefinition,arg6HandlePos,arg6Array) ;;Argument 7 (OPTIONAL INOUT p7 [*]A20) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[7], 20) - arg7Array = (@JsonArray)((@JsonObject)arguments.arrayValues[7]).GetProperty("PassedValue") - arg7Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg7Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[7], 20) + arg7Array = arguments[7].GetProperty("PassedValue") + arg7Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg7Array.GetArrayLength()) arg7HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg7Handle),argumentDefinition,arg7HandlePos,arg7Array) ;;Argument 8 (OPTIONAL INOUT p8 [*]D10.3) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[8], 10) - arg8Array = (@JsonArray)((@JsonObject)arguments.arrayValues[8]).GetProperty("PassedValue") - arg8Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg8Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[8], 10) + arg8Array = arguments[8].GetProperty("PassedValue") + arg8Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg8Array.GetArrayLength()) arg8HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg8Handle),argumentDefinition,arg8HandlePos,arg8Array) ;;Argument 9 (OPTIONAL INOUT p9 [*]I4) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[9], 4) - arg9Array = (@JsonArray)((@JsonObject)arguments.arrayValues[9]).GetProperty("PassedValue") - arg9Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg9Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[9], 4) + arg9Array = arguments[9].GetProperty("PassedValue") + arg9Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg9Array.GetArrayLength()) arg9HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg9Handle),argumentDefinition,arg9HandlePos,arg9Array) @@ -640,12 +647,12 @@ namespace TraditionalBridge.Test.Encrypt protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL INOUT p1 A5) @@ -661,13 +668,13 @@ namespace TraditionalBridge.Test.Encrypt ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL INOUT p1 A5) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 2 (OPTIONAL INOUT p2 A5) - arg2 = dispatcher.GetText((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetText(arguments[2]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -704,12 +711,12 @@ namespace TraditionalBridge.Test.Encrypt protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL IN p1 A5) @@ -725,13 +732,13 @@ namespace TraditionalBridge.Test.Encrypt ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL IN p1 A5) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 2 (OPTIONAL INOUT p2 A5) - arg2 = dispatcher.GetText((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetText(arguments[2]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -763,12 +770,12 @@ namespace TraditionalBridge.Test.Encrypt protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT verno A30) @@ -781,10 +788,10 @@ namespace TraditionalBridge.Test.Encrypt ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT verno A30) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -815,12 +822,12 @@ namespace TraditionalBridge.Test.Encrypt protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT STRTEST1 structure @Strtest1) @@ -834,11 +841,11 @@ namespace TraditionalBridge.Test.Encrypt ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT STRTEST1 structure @Strtest1) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mStrtest1Metadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mStrtest1Metadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -871,12 +878,12 @@ namespace TraditionalBridge.Test.Encrypt protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT strtest2 structure @Strtest2) @@ -890,11 +897,11 @@ namespace TraditionalBridge.Test.Encrypt ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT strtest2 structure @Strtest2) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mStrtest2Metadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mStrtest2Metadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ diff --git a/TraditionalBridge.Test/MethodDispatchers/IF913MethodDispachers.dbl b/TraditionalBridge.Test/MethodDispatchers/IF913MethodDispachers.dbl index 4d2f982c..fa8af0a8 100644 --- a/TraditionalBridge.Test/MethodDispatchers/IF913MethodDispachers.dbl +++ b/TraditionalBridge.Test/MethodDispatchers/IF913MethodDispachers.dbl @@ -15,6 +15,13 @@ import Harmony.TraditionalBridge import System.Collections import TraditionalBridge.Test.Models +.ifdef DBLV11 +import System.Text.Json +.define JSON_ELEMENT @JsonElement +.else +.define JSON_ELEMENT @JsonValue +.endc + namespace TraditionalBridge.Test.IF913 @@ -32,12 +39,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT AryLstAlpha ArrayList collection of A25) @@ -79,16 +86,16 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN AlphaArrayList ArrayList collection of A25) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1, @ArrayList endrecord @@ -98,11 +105,11 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN AlphaArrayList ArrayList collection of A25) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 25) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 25) + arg1Array = arguments[1].GetProperty("PassedValue") arg1 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg1Array,arg1) @@ -128,16 +135,16 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN DecimalArrayList ArrayList collection of D10) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1, @ArrayList endrecord @@ -147,11 +154,11 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN DecimalArrayList ArrayList collection of D10) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 10) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 10) + arg1Array = arguments[1].GetProperty("PassedValue") arg1 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg1Array,arg1) @@ -177,12 +184,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT DecALOut ArrayList collection of D7) @@ -224,16 +231,16 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN IDArrayList ArrayList collection of D7.2) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1, @ArrayList endrecord @@ -243,11 +250,11 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN IDArrayList ArrayList collection of D7.2) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 7) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 7) + arg1Array = arguments[1].GetProperty("PassedValue") arg1 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg1Array,arg1) @@ -273,12 +280,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT IDALout ArrayList collection of D7.2) @@ -320,16 +327,16 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN IntArrayList ArrayList collection of I4) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1, @ArrayList endrecord @@ -339,11 +346,11 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN IntArrayList ArrayList collection of I4) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 4) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 4) + arg1Array = arguments[1].GetProperty("PassedValue") arg1 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg1Array,arg1) @@ -369,12 +376,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT IntALOut ArrayList collection of I4) @@ -418,16 +425,16 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN STRUCTURETEST ArrayList collection of structure @Structuretest) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1, @ArrayList endrecord @@ -437,11 +444,11 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN STRUCTURETEST ArrayList collection of structure @Structuretest) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 41) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 41) + arg1Array = arguments[1].GetProperty("PassedValue") arg1 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg1Array,arg1) @@ -469,12 +476,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT STRUCTURETEST ArrayList collection of structure @Structuretest) @@ -516,16 +523,16 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN StringArrayList ArrayList collection of STRING) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1, @ArrayList endrecord @@ -535,11 +542,11 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN StringArrayList ArrayList collection of STRING) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 0) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 0) + arg1Array = arguments[1].GetProperty("PassedValue") arg1 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg1Array,arg1) @@ -565,12 +572,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT StringALOut ArrayList collection of STRING) @@ -614,16 +621,16 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN STRTEST1 ArrayList collection of structure @Strtest1) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1, @ArrayList endrecord @@ -633,11 +640,11 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN STRTEST1 ArrayList collection of structure @Strtest1) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 46) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 46) + arg1Array = arguments[1].GetProperty("PassedValue") arg1 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg1Array,arg1) @@ -665,12 +672,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT STRTEST1 ArrayList collection of structure @Strtest1) @@ -712,16 +719,16 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN DateTimeIn ArrayList collection of D8 YYYYMMDD date) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1, @ArrayList endrecord @@ -731,11 +738,11 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN DateTimeIn ArrayList collection of D8 YYYYMMDD date) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 8) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 8) + arg1Array = arguments[1].GetProperty("PassedValue") arg1 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg1Array,arg1) @@ -761,12 +768,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT DateTimeOut ArrayList collection of D8 YYYYMMDD date) @@ -808,16 +815,16 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN DecLong ArrayList collection of D18) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1, @ArrayList endrecord @@ -827,11 +834,11 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN DecLong ArrayList collection of D18) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 18) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 18) + arg1Array = arguments[1].GetProperty("PassedValue") arg1 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg1Array,arg1) @@ -857,12 +864,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT DecLong ArrayList collection of D18) @@ -904,16 +911,16 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN DecShort ArrayList collection of D4) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1, @ArrayList endrecord @@ -923,11 +930,11 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN DecShort ArrayList collection of D4) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 4) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 4) + arg1Array = arguments[1].GetProperty("PassedValue") arg1 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg1Array,arg1) @@ -953,12 +960,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT DecShort ArrayList collection of D4) @@ -1000,16 +1007,16 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN IDDouble ArrayList collection of D12.2) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1, @ArrayList endrecord @@ -1019,11 +1026,11 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN IDDouble ArrayList collection of D12.2) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 12) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 12) + arg1Array = arguments[1].GetProperty("PassedValue") arg1 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg1Array,arg1) @@ -1049,12 +1056,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT IDDouble ArrayList collection of D12.2) @@ -1096,16 +1103,16 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN BoolInt ArrayList collection of I1) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1, @ArrayList endrecord @@ -1115,11 +1122,11 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN BoolInt ArrayList collection of I1) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 1) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 1) + arg1Array = arguments[1].GetProperty("PassedValue") arg1 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg1Array,arg1) @@ -1145,12 +1152,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT BoolInt ArrayList collection of I1) @@ -1194,12 +1201,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT BOOLEANSTR structure @Booleanstr) @@ -1213,11 +1220,11 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT BOOLEANSTR structure @Booleanstr) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mBooleanstrMetadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mBooleanstrMetadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -1250,16 +1257,16 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN BOOLEANSTR ArrayList collection of structure @Booleanstr) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1, @ArrayList endrecord @@ -1269,11 +1276,11 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN BOOLEANSTR ArrayList collection of structure @Booleanstr) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 77) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 77) + arg1Array = arguments[1].GetProperty("PassedValue") arg1 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg1Array,arg1) @@ -1301,12 +1308,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT BOOLEANSTR ArrayList collection of structure @Booleanstr) @@ -1348,12 +1355,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT Favorite I4) @@ -1367,10 +1374,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT Favorite I4) - arg1 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetInt(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -1404,12 +1411,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT COERCESTRUCTURE structure @Coercestructure) @@ -1423,11 +1430,11 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT COERCESTRUCTURE structure @Coercestructure) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mCoercestructureMetadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mCoercestructureMetadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -1460,12 +1467,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT DATATABLESTR ArrayList collection of structure @Datatablestr returned as DataTable) @@ -1509,12 +1516,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT STRTEST12 ArrayList collection of structure @Strtest12 returned as DataTable) @@ -1558,16 +1565,16 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN DATATABLESTR ArrayList collection of structure @Datatablestr returned as DataTable) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1, @ArrayList endrecord @@ -1577,11 +1584,11 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN DATATABLESTR ArrayList collection of structure @Datatablestr returned as DataTable) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 44) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 44) + arg1Array = arguments[1].GetProperty("PassedValue") arg1 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg1Array,arg1) @@ -1609,12 +1616,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT DATETEBLESTR2 memory handle collection of structure @Dateteblestr2 returned as DataTable) @@ -1659,12 +1666,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT STRTEST14 ArrayList collection of structure @Strtest14 returned as DataTable) @@ -1706,12 +1713,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT datetimeOf14 D14 YYYYMMDD date) @@ -1725,10 +1732,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT datetimeOf14 D14 YYYYMMDD date) - arg1 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetDecimal(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -1760,12 +1767,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT Dateyyjjj D5 YYJJJ date) @@ -1779,10 +1786,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT Dateyyjjj D5 YYJJJ date) - arg1 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetDecimal(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -1814,12 +1821,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT Dateyymmdd D6 YYMMDD date) @@ -1833,10 +1840,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT Dateyymmdd D6 YYMMDD date) - arg1 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetDecimal(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -1868,12 +1875,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT Dateyyyyjjj D7 YYYYJJJ date) @@ -1887,10 +1894,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT Dateyyyyjjj D7 YYYYJJJ date) - arg1 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetDecimal(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -1922,12 +1929,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT DateTimeyyyymmdd D8 YYYYMMDD date) @@ -1941,10 +1948,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT DateTimeyyyymmdd D8 YYYYMMDD date) - arg1 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetDecimal(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -1976,12 +1983,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT DecToBool D1) @@ -1995,10 +2002,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT DecToBool D1) - arg1 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetDecimal(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -2030,12 +2037,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT DecToByte D1) @@ -2049,10 +2056,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT DecToByte D1) - arg1 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetDecimal(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -2084,12 +2091,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT DecToDec D16) @@ -2103,10 +2110,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT DecToDec D16) - arg1 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetDecimal(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -2138,12 +2145,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT DecToInt D4) @@ -2157,10 +2164,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT DecToInt D4) - arg1 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetDecimal(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -2192,12 +2199,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT DecToLong D18) @@ -2211,10 +2218,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT DecToLong D18) - arg1 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetDecimal(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -2246,12 +2253,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT DecToSbyte D1) @@ -2265,10 +2272,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT DecToSbyte D1) - arg1 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetDecimal(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -2300,12 +2307,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT DecToShort D2) @@ -2319,10 +2326,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT DecToShort D2) - arg1 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetDecimal(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -2354,12 +2361,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT DecToUint D4) @@ -2373,10 +2380,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT DecToUint D4) - arg1 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetDecimal(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -2408,12 +2415,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT DecToUlong D18) @@ -2427,10 +2434,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT DecToUlong D18) - arg1 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetDecimal(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -2462,12 +2469,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT DecToUshort D2) @@ -2481,10 +2488,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT DecToUshort D2) - arg1 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetDecimal(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -2516,12 +2523,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT IDtoDecimal D6.2) @@ -2535,10 +2542,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT IDtoDecimal D6.2) - arg1 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetImplied(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -2570,12 +2577,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT IDtoDouble D6.2) @@ -2589,10 +2596,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT IDtoDouble D6.2) - arg1 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetImplied(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -2624,12 +2631,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT IDtoFloat D6.2) @@ -2643,10 +2650,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT IDtoFloat D6.2) - arg1 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetImplied(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -2678,12 +2685,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT IntToBool I1) @@ -2697,10 +2704,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT IntToBool I1) - arg1 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetInt(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -2732,12 +2739,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT IntToByte I1) @@ -2751,10 +2758,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT IntToByte I1) - arg1 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetInt(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -2786,12 +2793,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT IntToInt I4) @@ -2805,10 +2812,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT IntToInt I4) - arg1 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetInt(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -2840,12 +2847,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT IntToLong I8) @@ -2859,10 +2866,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT IntToLong I8) - arg1 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetInt(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -2894,12 +2901,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT IntToSbyte I1) @@ -2913,10 +2920,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT IntToSbyte I1) - arg1 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetInt(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -2948,12 +2955,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT IntToShort I2) @@ -2967,10 +2974,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT IntToShort I2) - arg1 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetInt(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -3002,12 +3009,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT IntToUint I4) @@ -3021,10 +3028,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT IntToUint I4) - arg1 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetInt(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -3056,12 +3063,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT IntToUlong I8) @@ -3075,10 +3082,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT IntToUlong I8) - arg1 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetInt(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -3110,12 +3117,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT IntToUshort I2) @@ -3129,10 +3136,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT IntToUshort I2) - arg1 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetInt(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -3164,12 +3171,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT ndatetimeOf14 D14 YYYYMMDD date) @@ -3183,10 +3190,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT ndatetimeOf14 D14 YYYYMMDD date) - arg1 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetDecimal(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -3218,12 +3225,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT NDateTime8 D8 YYYYMMDD date) @@ -3237,10 +3244,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT NDateTime8 D8 YYYYMMDD date) - arg1 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetDecimal(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -3274,12 +3281,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT NULLDTSTR structure @Nulldtstr) @@ -3293,11 +3300,11 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT NULLDTSTR structure @Nulldtstr) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mNulldtstrMetadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mNulldtstrMetadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -3330,12 +3337,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT NULLDTARY structure @Nulldtary) @@ -3349,11 +3356,11 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT NULLDTARY structure @Nulldtary) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mNulldtaryMetadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mNulldtaryMetadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -3386,12 +3393,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT NULLDTSTR ArrayList collection of structure @Nulldtstr) @@ -3435,12 +3442,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN CustNumber D1) @@ -3460,13 +3467,13 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN CustNumber D1) - arg1 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetDecimal(arguments[1]) ;;Argument 2 (REQUIRED IN aDate D8 YYYYMMDD date) - arg2 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetDecimal(arguments[2]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -3503,12 +3510,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT timehhmm D4 HHMM time) @@ -3522,10 +3529,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT timehhmm D4 HHMM time) - arg1 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetDecimal(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -3557,12 +3564,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT timehhmmss D6 HHMM time) @@ -3576,10 +3583,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT timehhmmss D6 HHMM time) - arg1 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetDecimal(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -3611,12 +3618,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT astring STRING) @@ -3630,10 +3637,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT astring STRING) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -3665,12 +3672,12 @@ namespace TraditionalBridge.Test.IF913 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT SysStr STRING) @@ -3683,10 +3690,10 @@ namespace TraditionalBridge.Test.IF913 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT SysStr STRING) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine diff --git a/TraditionalBridge.Test/MethodDispatchers/LrgPktsMethodDispachers.dbl b/TraditionalBridge.Test/MethodDispatchers/LrgPktsMethodDispachers.dbl index 7a754a86..f7fe9114 100644 --- a/TraditionalBridge.Test/MethodDispatchers/LrgPktsMethodDispachers.dbl +++ b/TraditionalBridge.Test/MethodDispatchers/LrgPktsMethodDispachers.dbl @@ -15,6 +15,13 @@ import Harmony.TraditionalBridge import System.Collections import TraditionalBridge.Test.Models +.ifdef DBLV11 +import System.Text.Json +.define JSON_ELEMENT @JsonElement +.else +.define JSON_ELEMENT @JsonValue +.endc + namespace TraditionalBridge.Test.LrgPkts @@ -34,16 +41,16 @@ namespace TraditionalBridge.Test.LrgPkts protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT DATASET [*]structure @Dataset) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1Handle, D_HANDLE arg1HandlePos, int endrecord @@ -59,12 +66,12 @@ namespace TraditionalBridge.Test.LrgPkts ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT DATASET [*]structure @Dataset) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 1493) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") - arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 1493) + arg1Array = arguments[1].GetProperty("PassedValue") + arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.GetArrayLength()) arg1HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg1Handle),argumentDefinition,arg1HandlePos,arg1Array) @@ -99,20 +106,20 @@ namespace TraditionalBridge.Test.LrgPkts protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT ADDRESS [*]structure @Addres) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1Handle, D_HANDLE arg1HandlePos, int ;;Argument 2 (REQUIRED INOUT PERFSTRUCT [*]structure @Perfstruct) - arg2Array, @JsonArray + arg2Array, JSON_ELEMENT arg2Handle, D_HANDLE arg2HandlePos, int endrecord @@ -133,19 +140,19 @@ namespace TraditionalBridge.Test.LrgPkts ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT ADDRESS [*]structure @Addres) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 182) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") - arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 182) + arg1Array = arguments[1].GetProperty("PassedValue") + arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.GetArrayLength()) arg1HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg1Handle),argumentDefinition,arg1HandlePos,arg1Array) ;;Argument 2 (REQUIRED INOUT PERFSTRUCT [*]structure @Perfstruct) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[2], 72) - arg2Array = (@JsonArray)((@JsonObject)arguments.arrayValues[2]).GetProperty("PassedValue") - arg2Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg2Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[2], 72) + arg2Array = arguments[2].GetProperty("PassedValue") + arg2Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg2Array.GetArrayLength()) arg2HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg2Handle),argumentDefinition,arg2HandlePos,arg2Array) @@ -183,16 +190,16 @@ namespace TraditionalBridge.Test.LrgPkts protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT ADDRESS [*]structure @Addres) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1Handle, D_HANDLE arg1HandlePos, int endrecord @@ -208,12 +215,12 @@ namespace TraditionalBridge.Test.LrgPkts ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT ADDRESS [*]structure @Addres) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 182) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") - arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 182) + arg1Array = arguments[1].GetProperty("PassedValue") + arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.GetArrayLength()) arg1HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg1Handle),argumentDefinition,arg1HandlePos,arg1Array) @@ -248,20 +255,20 @@ namespace TraditionalBridge.Test.LrgPkts protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT PERFSTRUCT [*]structure @Perfstruct) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1Handle, D_HANDLE arg1HandlePos, int ;;Argument 2 (REQUIRED INOUT ADDRESS [*]structure @Addres) - arg2Array, @JsonArray + arg2Array, JSON_ELEMENT arg2Handle, D_HANDLE arg2HandlePos, int endrecord @@ -282,19 +289,19 @@ namespace TraditionalBridge.Test.LrgPkts ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT PERFSTRUCT [*]structure @Perfstruct) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 72) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") - arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 72) + arg1Array = arguments[1].GetProperty("PassedValue") + arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.GetArrayLength()) arg1HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg1Handle),argumentDefinition,arg1HandlePos,arg1Array) ;;Argument 2 (REQUIRED INOUT ADDRESS [*]structure @Addres) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[2], 182) - arg2Array = (@JsonArray)((@JsonObject)arguments.arrayValues[2]).GetProperty("PassedValue") - arg2Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg2Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[2], 182) + arg2Array = arguments[2].GetProperty("PassedValue") + arg2Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg2Array.GetArrayLength()) arg2HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg2Handle),argumentDefinition,arg2HandlePos,arg2Array) @@ -330,12 +337,12 @@ namespace TraditionalBridge.Test.LrgPkts protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT number I4) @@ -379,12 +386,12 @@ namespace TraditionalBridge.Test.LrgPkts protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT PERFSTRUCT [*]structure @Perfstruct) @@ -434,16 +441,16 @@ namespace TraditionalBridge.Test.LrgPkts protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN PERFSTRUCT [*]structure @Perfstruct) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1Handle, D_HANDLE arg1HandlePos, int ;;Argument 2 (REQUIRED IN count I4) @@ -461,17 +468,17 @@ namespace TraditionalBridge.Test.LrgPkts ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN PERFSTRUCT [*]structure @Perfstruct) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 72) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") - arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 72) + arg1Array = arguments[1].GetProperty("PassedValue") + arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.GetArrayLength()) arg1HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg1Handle),argumentDefinition,arg1HandlePos,arg1Array) ;;Argument 2 (REQUIRED IN count I4) - arg2 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetInt(arguments[2]) ;;------------------------------------------------------------ ;; Call the underlying routine diff --git a/TraditionalBridge.Test/MethodDispatchers/NoParmsMethodDispachers.dbl b/TraditionalBridge.Test/MethodDispatchers/NoParmsMethodDispachers.dbl index 15025f70..4700e6c4 100644 --- a/TraditionalBridge.Test/MethodDispatchers/NoParmsMethodDispachers.dbl +++ b/TraditionalBridge.Test/MethodDispatchers/NoParmsMethodDispachers.dbl @@ -15,6 +15,13 @@ import Harmony.TraditionalBridge import System.Collections import TraditionalBridge.Test.Models +.ifdef DBLV11 +import System.Text.Json +.define JSON_ELEMENT @JsonElement +.else +.define JSON_ELEMENT @JsonValue +.endc + namespace TraditionalBridge.Test.NoParms @@ -32,12 +39,12 @@ namespace TraditionalBridge.Test.NoParms protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition endrecord @@ -72,12 +79,12 @@ namespace TraditionalBridge.Test.NoParms protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition returnValue, D5 diff --git a/TraditionalBridge.Test/MethodDispatchers/Pool1MethodDispachers.dbl b/TraditionalBridge.Test/MethodDispatchers/Pool1MethodDispachers.dbl index e5340dae..7031fdc8 100644 --- a/TraditionalBridge.Test/MethodDispatchers/Pool1MethodDispachers.dbl +++ b/TraditionalBridge.Test/MethodDispatchers/Pool1MethodDispachers.dbl @@ -15,6 +15,13 @@ import Harmony.TraditionalBridge import System.Collections import TraditionalBridge.Test.Models +.ifdef DBLV11 +import System.Text.Json +.define JSON_ELEMENT @JsonElement +.else +.define JSON_ELEMENT @JsonValue +.endc + namespace TraditionalBridge.Test.Pool1 @@ -32,12 +39,12 @@ namespace TraditionalBridge.Test.Pool1 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT message A30) @@ -79,12 +86,12 @@ namespace TraditionalBridge.Test.Pool1 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN message A30) @@ -97,10 +104,10 @@ namespace TraditionalBridge.Test.Pool1 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN message A30) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine diff --git a/TraditionalBridge.Test/MethodDispatchers/Pool2MethodDispachers.dbl b/TraditionalBridge.Test/MethodDispatchers/Pool2MethodDispachers.dbl index 8bb53de5..85b41da1 100644 --- a/TraditionalBridge.Test/MethodDispatchers/Pool2MethodDispachers.dbl +++ b/TraditionalBridge.Test/MethodDispatchers/Pool2MethodDispachers.dbl @@ -15,6 +15,13 @@ import Harmony.TraditionalBridge import System.Collections import TraditionalBridge.Test.Models +.ifdef DBLV11 +import System.Text.Json +.define JSON_ELEMENT @JsonElement +.else +.define JSON_ELEMENT @JsonValue +.endc + namespace TraditionalBridge.Test.Pool2 @@ -32,12 +39,12 @@ namespace TraditionalBridge.Test.Pool2 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition returnValue, I4 @@ -76,12 +83,12 @@ namespace TraditionalBridge.Test.Pool2 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition endrecord @@ -116,12 +123,12 @@ namespace TraditionalBridge.Test.Pool2 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT message A30) @@ -163,12 +170,12 @@ namespace TraditionalBridge.Test.Pool2 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN message A30) @@ -181,10 +188,10 @@ namespace TraditionalBridge.Test.Pool2 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN message A30) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine diff --git a/TraditionalBridge.Test/MethodDispatchers/Pool3MethodDispachers.dbl b/TraditionalBridge.Test/MethodDispatchers/Pool3MethodDispachers.dbl index e398a027..52b0b24a 100644 --- a/TraditionalBridge.Test/MethodDispatchers/Pool3MethodDispachers.dbl +++ b/TraditionalBridge.Test/MethodDispatchers/Pool3MethodDispachers.dbl @@ -15,6 +15,13 @@ import Harmony.TraditionalBridge import System.Collections import TraditionalBridge.Test.Models +.ifdef DBLV11 +import System.Text.Json +.define JSON_ELEMENT @JsonElement +.else +.define JSON_ELEMENT @JsonValue +.endc + namespace TraditionalBridge.Test.Pool3 @@ -32,12 +39,12 @@ namespace TraditionalBridge.Test.Pool3 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition returnValue, I4 @@ -76,12 +83,12 @@ namespace TraditionalBridge.Test.Pool3 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition endrecord @@ -116,12 +123,12 @@ namespace TraditionalBridge.Test.Pool3 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition endrecord @@ -156,12 +163,12 @@ namespace TraditionalBridge.Test.Pool3 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition endrecord @@ -196,12 +203,12 @@ namespace TraditionalBridge.Test.Pool3 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT message A30) @@ -243,12 +250,12 @@ namespace TraditionalBridge.Test.Pool3 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN message A30) @@ -261,10 +268,10 @@ namespace TraditionalBridge.Test.Pool3 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN message A30) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine diff --git a/TraditionalBridge.Test/MethodDispatchers/Pool4MethodDispachers.dbl b/TraditionalBridge.Test/MethodDispatchers/Pool4MethodDispachers.dbl index e9e4e225..c28773df 100644 --- a/TraditionalBridge.Test/MethodDispatchers/Pool4MethodDispachers.dbl +++ b/TraditionalBridge.Test/MethodDispatchers/Pool4MethodDispachers.dbl @@ -15,6 +15,13 @@ import Harmony.TraditionalBridge import System.Collections import TraditionalBridge.Test.Models +.ifdef DBLV11 +import System.Text.Json +.define JSON_ELEMENT @JsonElement +.else +.define JSON_ELEMENT @JsonValue +.endc + namespace TraditionalBridge.Test.Pool4 @@ -32,12 +39,12 @@ namespace TraditionalBridge.Test.Pool4 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition endrecord @@ -72,12 +79,12 @@ namespace TraditionalBridge.Test.Pool4 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT message A30) @@ -119,12 +126,12 @@ namespace TraditionalBridge.Test.Pool4 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN message A30) @@ -137,10 +144,10 @@ namespace TraditionalBridge.Test.Pool4 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN message A30) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine diff --git a/TraditionalBridge.Test/MethodDispatchers/Pool5MethodDispachers.dbl b/TraditionalBridge.Test/MethodDispatchers/Pool5MethodDispachers.dbl index 90d5c0d8..53b8083e 100644 --- a/TraditionalBridge.Test/MethodDispatchers/Pool5MethodDispachers.dbl +++ b/TraditionalBridge.Test/MethodDispatchers/Pool5MethodDispachers.dbl @@ -15,6 +15,13 @@ import Harmony.TraditionalBridge import System.Collections import TraditionalBridge.Test.Models +.ifdef DBLV11 +import System.Text.Json +.define JSON_ELEMENT @JsonElement +.else +.define JSON_ELEMENT @JsonValue +.endc + namespace TraditionalBridge.Test.Pool5 @@ -32,12 +39,12 @@ namespace TraditionalBridge.Test.Pool5 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition returnValue, I4 @@ -76,12 +83,12 @@ namespace TraditionalBridge.Test.Pool5 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT message A30) @@ -123,12 +130,12 @@ namespace TraditionalBridge.Test.Pool5 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN message A30) @@ -141,10 +148,10 @@ namespace TraditionalBridge.Test.Pool5 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN message A30) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine diff --git a/TraditionalBridge.Test/MethodDispatchers/Pool6MethodDispachers.dbl b/TraditionalBridge.Test/MethodDispatchers/Pool6MethodDispachers.dbl index 784929e4..21de7a2d 100644 --- a/TraditionalBridge.Test/MethodDispatchers/Pool6MethodDispachers.dbl +++ b/TraditionalBridge.Test/MethodDispatchers/Pool6MethodDispachers.dbl @@ -15,6 +15,13 @@ import Harmony.TraditionalBridge import System.Collections import TraditionalBridge.Test.Models +.ifdef DBLV11 +import System.Text.Json +.define JSON_ELEMENT @JsonElement +.else +.define JSON_ELEMENT @JsonValue +.endc + namespace TraditionalBridge.Test.Pool6 @@ -32,12 +39,12 @@ namespace TraditionalBridge.Test.Pool6 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition endrecord @@ -72,12 +79,12 @@ namespace TraditionalBridge.Test.Pool6 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT message A30) @@ -119,12 +126,12 @@ namespace TraditionalBridge.Test.Pool6 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN message A30) @@ -137,10 +144,10 @@ namespace TraditionalBridge.Test.Pool6 ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN message A30) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -164,12 +171,12 @@ namespace TraditionalBridge.Test.Pool6 protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition endrecord diff --git a/TraditionalBridge.Test/MethodDispatchers/TestDateMethodDispachers.dbl b/TraditionalBridge.Test/MethodDispatchers/TestDateMethodDispachers.dbl index 9afce158..34ddafd5 100644 --- a/TraditionalBridge.Test/MethodDispatchers/TestDateMethodDispachers.dbl +++ b/TraditionalBridge.Test/MethodDispatchers/TestDateMethodDispachers.dbl @@ -15,6 +15,13 @@ import Harmony.TraditionalBridge import System.Collections import TraditionalBridge.Test.Models +.ifdef DBLV11 +import System.Text.Json +.define JSON_ELEMENT @JsonElement +.else +.define JSON_ELEMENT @JsonValue +.endc + namespace TraditionalBridge.Test.TestDate @@ -34,12 +41,12 @@ namespace TraditionalBridge.Test.TestDate protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN idx D2) @@ -55,10 +62,10 @@ namespace TraditionalBridge.Test.TestDate ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN idx D2) - arg1 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetDecimal(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -90,12 +97,12 @@ namespace TraditionalBridge.Test.TestDate protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT USERDATES structure @Userdate) diff --git a/TraditionalBridge.Test/MethodDispatchers/UserDataMethodDispachers.dbl b/TraditionalBridge.Test/MethodDispatchers/UserDataMethodDispachers.dbl index b36ef4b9..b0e2cbd1 100644 --- a/TraditionalBridge.Test/MethodDispatchers/UserDataMethodDispachers.dbl +++ b/TraditionalBridge.Test/MethodDispatchers/UserDataMethodDispachers.dbl @@ -15,6 +15,13 @@ import Harmony.TraditionalBridge import System.Collections import TraditionalBridge.Test.Models +.ifdef DBLV11 +import System.Text.Json +.define JSON_ELEMENT @JsonElement +.else +.define JSON_ELEMENT @JsonValue +.endc + namespace TraditionalBridge.Test.UserData @@ -34,12 +41,12 @@ namespace TraditionalBridge.Test.UserData protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT DNETDATETIME structure @Dnetdatetime) @@ -53,11 +60,11 @@ namespace TraditionalBridge.Test.UserData ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT DNETDATETIME structure @Dnetdatetime) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mDnetdatetimeMetadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mDnetdatetimeMetadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ diff --git a/TraditionalBridge.Test/MethodDispatchers/V93IFMethodDispachers.dbl b/TraditionalBridge.Test/MethodDispatchers/V93IFMethodDispachers.dbl index 92b0abb8..8f96ce70 100644 --- a/TraditionalBridge.Test/MethodDispatchers/V93IFMethodDispachers.dbl +++ b/TraditionalBridge.Test/MethodDispatchers/V93IFMethodDispachers.dbl @@ -15,6 +15,13 @@ import Harmony.TraditionalBridge import System.Collections import TraditionalBridge.Test.Models +.ifdef DBLV11 +import System.Text.Json +.define JSON_ELEMENT @JsonElement +.else +.define JSON_ELEMENT @JsonValue +.endc + namespace TraditionalBridge.Test.V93IF @@ -34,12 +41,12 @@ namespace TraditionalBridge.Test.V93IF protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT V93REPOSOPTS ArrayList collection of structure @V93reposopt returned as DataTable) @@ -83,16 +90,16 @@ namespace TraditionalBridge.Test.V93IF protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN V93REPOSOPTS ArrayList collection of structure @V93reposopt returned as DataTable) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1, @ArrayList endrecord @@ -102,11 +109,11 @@ namespace TraditionalBridge.Test.V93IF ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN V93REPOSOPTS ArrayList collection of structure @V93reposopt returned as DataTable) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 41) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 41) + arg1Array = arguments[1].GetProperty("PassedValue") arg1 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg1Array,arg1) @@ -134,12 +141,12 @@ namespace TraditionalBridge.Test.V93IF protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT BINARYTEST structure @Binarytest) @@ -153,11 +160,11 @@ namespace TraditionalBridge.Test.V93IF ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT BINARYTEST structure @Binarytest) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mBinarytestMetadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mBinarytestMetadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -188,12 +195,12 @@ namespace TraditionalBridge.Test.V93IF protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN CustID I4) @@ -213,13 +220,13 @@ namespace TraditionalBridge.Test.V93IF ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN CustID I4) - arg1 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetInt(arguments[1]) ;;Argument 2 (REQUIRED IN AddressID I4) - arg2 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetInt(arguments[2]) ;;Argument 4 (REQUIRED IN GRFA D_HANDLE) ;TODO: Template needs code for BINARY HANDLE arguments! @@ -255,12 +262,12 @@ namespace TraditionalBridge.Test.V93IF protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN CustID I4) @@ -280,13 +287,13 @@ namespace TraditionalBridge.Test.V93IF ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN CustID I4) - arg1 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetInt(arguments[1]) ;;Argument 2 (REQUIRED IN AddressID I4) - arg2 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetInt(arguments[2]) ;;Argument 4 (REQUIRED INOUT GRFA D_HANDLE) ;TODO: Template needs code for BINARY HANDLE arguments! @@ -327,12 +334,12 @@ namespace TraditionalBridge.Test.V93IF protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN CustID I4) @@ -352,13 +359,13 @@ namespace TraditionalBridge.Test.V93IF ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN CustID I4) - arg1 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetInt(arguments[1]) ;;Argument 2 (REQUIRED IN AddressID I4) - arg2 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetInt(arguments[2]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -397,12 +404,12 @@ namespace TraditionalBridge.Test.V93IF protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT FUENTES structure @Fuente) @@ -416,11 +423,11 @@ namespace TraditionalBridge.Test.V93IF ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT FUENTES structure @Fuente) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mFuenteMetadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mFuenteMetadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -453,16 +460,16 @@ namespace TraditionalBridge.Test.V93IF protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN FUENTES ArrayList collection of structure @Fuente) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1, @ArrayList endrecord @@ -472,11 +479,11 @@ namespace TraditionalBridge.Test.V93IF ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN FUENTES ArrayList collection of structure @Fuente) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 43) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 43) + arg1Array = arguments[1].GetProperty("PassedValue") arg1 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg1Array,arg1) @@ -504,12 +511,12 @@ namespace TraditionalBridge.Test.V93IF protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT FUENTES ArrayList collection of structure @Fuente) @@ -551,12 +558,12 @@ namespace TraditionalBridge.Test.V93IF protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT AColor enum COLOR) @@ -569,10 +576,10 @@ namespace TraditionalBridge.Test.V93IF ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT AColor enum COLOR) - arg1 = (COLOR)dispatcher.GetInt((@JsonObject)arguments.arrayValues[1]) + arg1 = (COLOR)dispatcher.GetInt(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -602,12 +609,12 @@ namespace TraditionalBridge.Test.V93IF protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition returnValue, COLOR @@ -646,12 +653,12 @@ namespace TraditionalBridge.Test.V93IF protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN aColor enum COLOR) @@ -669,13 +676,13 @@ namespace TraditionalBridge.Test.V93IF ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN aColor enum COLOR) - arg1 = (COLOR)dispatcher.GetInt((@JsonObject)arguments.arrayValues[1]) + arg1 = (COLOR)dispatcher.GetInt(arguments[1]) ;;Argument 2 (REQUIRED INOUT Alpha1 A10) - arg2 = dispatcher.GetText((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetText(arguments[2]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -715,12 +722,12 @@ namespace TraditionalBridge.Test.V93IF protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT ENUMSTRUCTURE structure @Enumstructure) @@ -734,11 +741,11 @@ namespace TraditionalBridge.Test.V93IF ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT ENUMSTRUCTURE structure @Enumstructure) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mEnumstructureMetadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mEnumstructureMetadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -771,16 +778,16 @@ namespace TraditionalBridge.Test.V93IF protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT ENUMSTRUCTURE [*]structure @Enumstructure) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1Handle, D_HANDLE arg1HandlePos, int endrecord @@ -796,12 +803,12 @@ namespace TraditionalBridge.Test.V93IF ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT ENUMSTRUCTURE [*]structure @Enumstructure) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 44) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") - arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 44) + arg1Array = arguments[1].GetProperty("PassedValue") + arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.GetArrayLength()) arg1HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg1Handle),argumentDefinition,arg1HandlePos,arg1Array) @@ -834,16 +841,16 @@ namespace TraditionalBridge.Test.V93IF protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN ENUMSTRUCTURE ArrayList collection of structure @Enumstructure) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1, @ArrayList endrecord @@ -853,11 +860,11 @@ namespace TraditionalBridge.Test.V93IF ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN ENUMSTRUCTURE ArrayList collection of structure @Enumstructure) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 44) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 44) + arg1Array = arguments[1].GetProperty("PassedValue") arg1 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg1Array,arg1) @@ -885,12 +892,12 @@ namespace TraditionalBridge.Test.V93IF protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT ENUMSTRUCTURE ArrayList collection of structure @Enumstructure) @@ -934,12 +941,12 @@ namespace TraditionalBridge.Test.V93IF protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT TIMEKEY ArrayList collection of structure @Timekey returned as DataTable) @@ -983,12 +990,12 @@ namespace TraditionalBridge.Test.V93IF protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT V93REPOSOPTS structure @V93reposopt) @@ -1002,11 +1009,11 @@ namespace TraditionalBridge.Test.V93IF ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT V93REPOSOPTS structure @V93reposopt) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mV93reposoptMetadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mV93reposoptMetadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -1039,12 +1046,12 @@ namespace TraditionalBridge.Test.V93IF protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT STROPTSOUTTER structure @Stroptsoutter) @@ -1058,11 +1065,11 @@ namespace TraditionalBridge.Test.V93IF ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT STROPTSOUTTER structure @Stroptsoutter) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mStroptsoutterMetadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mStroptsoutterMetadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ diff --git a/TraditionalBridge.Test/MethodDispatchers/WCFieldsMethodDispachers.dbl b/TraditionalBridge.Test/MethodDispatchers/WCFieldsMethodDispachers.dbl index 97256907..0f0198fc 100644 --- a/TraditionalBridge.Test/MethodDispatchers/WCFieldsMethodDispachers.dbl +++ b/TraditionalBridge.Test/MethodDispatchers/WCFieldsMethodDispachers.dbl @@ -15,6 +15,13 @@ import Harmony.TraditionalBridge import System.Collections import TraditionalBridge.Test.Models +.ifdef DBLV11 +import System.Text.Json +.define JSON_ELEMENT @JsonElement +.else +.define JSON_ELEMENT @JsonValue +.endc + namespace TraditionalBridge.Test.WCFields @@ -34,12 +41,12 @@ namespace TraditionalBridge.Test.WCFields protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT STRTEST1 structure @Strtest1) @@ -53,11 +60,11 @@ namespace TraditionalBridge.Test.WCFields ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT STRTEST1 structure @Strtest1) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mStrtest1Metadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mStrtest1Metadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -90,12 +97,12 @@ namespace TraditionalBridge.Test.WCFields protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT STRTEST2 structure @Strtest2) @@ -109,11 +116,11 @@ namespace TraditionalBridge.Test.WCFields ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT STRTEST2 structure @Strtest2) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mStrtest2Metadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mStrtest2Metadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -146,12 +153,12 @@ namespace TraditionalBridge.Test.WCFields protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT STRTEST3 structure @Strtest3) @@ -165,11 +172,11 @@ namespace TraditionalBridge.Test.WCFields ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT STRTEST3 structure @Strtest3) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mStrtest3Metadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mStrtest3Metadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -202,18 +209,18 @@ namespace TraditionalBridge.Test.WCFields protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT p1de7 D7) arg1, d7 ;;Argument 2 (REQUIRED INOUT STRTEST3 [*]structure @Strtest3) - arg2Array, @JsonArray + arg2Array, JSON_ELEMENT arg2Handle, D_HANDLE arg2HandlePos, int ;;Argument 3 (REQUIRED INOUT p3al10 A10) @@ -231,20 +238,20 @@ namespace TraditionalBridge.Test.WCFields ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT p1de7 D7) - arg1 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetDecimal(arguments[1]) ;;Argument 2 (REQUIRED INOUT STRTEST3 [*]structure @Strtest3) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[2], 58) - arg2Array = (@JsonArray)((@JsonObject)arguments.arrayValues[2]).GetProperty("PassedValue") - arg2Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg2Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[2], 58) + arg2Array = arguments[2].GetProperty("PassedValue") + arg2Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg2Array.GetArrayLength()) arg2HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg2Handle),argumentDefinition,arg2HandlePos,arg2Array) ;;Argument 3 (REQUIRED INOUT p3al10 A10) - arg3 = dispatcher.GetText((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetText(arguments[3]) ;;------------------------------------------------------------ ;; Call the underlying routine diff --git a/TraditionalBridge.Test/MethodDispatchers/ZDateTimeMethodDispachers.dbl b/TraditionalBridge.Test/MethodDispatchers/ZDateTimeMethodDispachers.dbl index e684a0d8..47cd87f5 100644 --- a/TraditionalBridge.Test/MethodDispatchers/ZDateTimeMethodDispachers.dbl +++ b/TraditionalBridge.Test/MethodDispatchers/ZDateTimeMethodDispachers.dbl @@ -15,6 +15,13 @@ import Harmony.TraditionalBridge import System.Collections import TraditionalBridge.Test.Models +.ifdef DBLV11 +import System.Text.Json +.define JSON_ELEMENT @JsonElement +.else +.define JSON_ELEMENT @JsonValue +.endc + namespace TraditionalBridge.Test.ZDateTime @@ -32,12 +39,12 @@ namespace TraditionalBridge.Test.ZDateTime protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN Dt20In D20 YYYYMMDD date) @@ -55,13 +62,13 @@ namespace TraditionalBridge.Test.ZDateTime ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN Dt20In D20 YYYYMMDD date) - arg1 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetDecimal(arguments[1]) ;;Argument 3 (REQUIRED INOUT Dt20InOut D20 YYYYMMDD date) - arg3 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetDecimal(arguments[3]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -98,12 +105,12 @@ namespace TraditionalBridge.Test.ZDateTime protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT dt8 D8 YYYYMMDD date) @@ -121,16 +128,16 @@ namespace TraditionalBridge.Test.ZDateTime ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT dt8 D8 YYYYMMDD date) - arg1 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetDecimal(arguments[1]) ;;Argument 2 (REQUIRED INOUT dt6 D6 YYMMDD date) - arg2 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetDecimal(arguments[2]) ;;Argument 3 (REQUIRED INOUT dt14 D14 YYYYMMDD date) - arg3 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetDecimal(arguments[3]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -174,16 +181,16 @@ namespace TraditionalBridge.Test.ZDateTime protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT DATETIMESTR [*]structure @Datetimestr) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1Handle, D_HANDLE arg1HandlePos, int endrecord @@ -199,12 +206,12 @@ namespace TraditionalBridge.Test.ZDateTime ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT DATETIMESTR [*]structure @Datetimestr) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 34) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") - arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 34) + arg1Array = arguments[1].GetProperty("PassedValue") + arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.GetArrayLength()) arg1HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg1Handle),argumentDefinition,arg1HandlePos,arg1Array) @@ -237,12 +244,12 @@ namespace TraditionalBridge.Test.ZDateTime protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT DATETIMEARY structure @Datetimeary) @@ -256,11 +263,11 @@ namespace TraditionalBridge.Test.ZDateTime ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT DATETIMEARY structure @Datetimeary) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mDatetimearyMetadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mDatetimearyMetadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -293,12 +300,12 @@ namespace TraditionalBridge.Test.ZDateTime protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT USERDATES structure @Userdate) diff --git a/TraditionalBridge.Test/MethodDispatchers/data64kMethodDispachers.dbl b/TraditionalBridge.Test/MethodDispatchers/data64kMethodDispachers.dbl index 7e7465af..c3a02323 100644 --- a/TraditionalBridge.Test/MethodDispatchers/data64kMethodDispachers.dbl +++ b/TraditionalBridge.Test/MethodDispatchers/data64kMethodDispachers.dbl @@ -15,6 +15,13 @@ import Harmony.TraditionalBridge import System.Collections import TraditionalBridge.Test.Models +.ifdef DBLV11 +import System.Text.Json +.define JSON_ELEMENT @JsonElement +.else +.define JSON_ELEMENT @JsonValue +.endc + namespace TraditionalBridge.Test.data64k @@ -34,16 +41,16 @@ namespace TraditionalBridge.Test.data64k protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT DATASET [*]structure @Dataset) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1Handle, D_HANDLE arg1HandlePos, int endrecord @@ -59,12 +66,12 @@ namespace TraditionalBridge.Test.data64k ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT DATASET [*]structure @Dataset) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 1493) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") - arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 1493) + arg1Array = arguments[1].GetProperty("PassedValue") + arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.GetArrayLength()) arg1HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg1Handle),argumentDefinition,arg1HandlePos,arg1Array) @@ -95,12 +102,12 @@ namespace TraditionalBridge.Test.data64k protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT decparm1 D5) @@ -126,27 +133,27 @@ namespace TraditionalBridge.Test.data64k ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT decparm1 D5) - arg1 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetDecimal(arguments[1]) ;;Argument 2 (REQUIRED IN inba D_HANDLE) ;TODO: Template needs code for BINARY HANDLE arguments! arg2 = ;;Argument 3 (REQUIRED INOUT alparm A10) - arg3 = dispatcher.GetText((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetText(arguments[3]) ;;Argument 5 (REQUIRED INOUT idparm D5.2) - arg5 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[5]) + arg5 = dispatcher.GetImplied(arguments[5]) ;;Argument 6 (REQUIRED INOUT inoutba D_HANDLE) ;TODO: Template needs code for BINARY HANDLE arguments! arg6 = ;;Argument 7 (REQUIRED INOUT decparm2 D5) - arg7 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[7]) + arg7 = dispatcher.GetDecimal(arguments[7]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -203,12 +210,12 @@ namespace TraditionalBridge.Test.data64k protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN inBA D_HANDLE) @@ -221,7 +228,7 @@ namespace TraditionalBridge.Test.data64k ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN inBA D_HANDLE) ;TODO: Template needs code for BINARY HANDLE arguments! @@ -249,12 +256,12 @@ namespace TraditionalBridge.Test.data64k protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN p1 D_HANDLE) @@ -267,7 +274,7 @@ namespace TraditionalBridge.Test.data64k ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN p1 D_HANDLE) ;TODO: Template needs code for HANDLE arguments! @@ -295,12 +302,12 @@ namespace TraditionalBridge.Test.data64k protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT inoutba D_HANDLE) @@ -313,7 +320,7 @@ namespace TraditionalBridge.Test.data64k ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT inoutba D_HANDLE) ;TODO: Template needs code for BINARY HANDLE arguments! @@ -346,12 +353,12 @@ namespace TraditionalBridge.Test.data64k protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT p1 D_HANDLE) @@ -364,7 +371,7 @@ namespace TraditionalBridge.Test.data64k ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT p1 D_HANDLE) ;TODO: Template needs code for HANDLE arguments! @@ -397,12 +404,12 @@ namespace TraditionalBridge.Test.data64k protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT p1 D_HANDLE) @@ -415,7 +422,7 @@ namespace TraditionalBridge.Test.data64k ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT p1 D_HANDLE) ;TODO: Template needs code for HANDLE arguments! @@ -448,12 +455,12 @@ namespace TraditionalBridge.Test.data64k protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT outba D_HANDLE) @@ -495,12 +502,12 @@ namespace TraditionalBridge.Test.data64k protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN filename A80) @@ -515,10 +522,10 @@ namespace TraditionalBridge.Test.data64k ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN filename A80) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -547,12 +554,12 @@ namespace TraditionalBridge.Test.data64k protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT p1 D_HANDLE) @@ -594,12 +601,12 @@ namespace TraditionalBridge.Test.data64k protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT P1Handle D_HANDLE) @@ -614,7 +621,7 @@ namespace TraditionalBridge.Test.data64k ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT P1Handle D_HANDLE) ;TODO: Template needs code for HANDLE arguments! diff --git a/TraditionalBridge.Test/MethodDispatchers/smcMethodDispachers.dbl b/TraditionalBridge.Test/MethodDispatchers/smcMethodDispachers.dbl index 481b18b3..66327d89 100644 --- a/TraditionalBridge.Test/MethodDispatchers/smcMethodDispachers.dbl +++ b/TraditionalBridge.Test/MethodDispatchers/smcMethodDispachers.dbl @@ -15,6 +15,13 @@ import Harmony.TraditionalBridge import System.Collections import TraditionalBridge.Test.Models +.ifdef DBLV11 +import System.Text.Json +.define JSON_ELEMENT @JsonElement +.else +.define JSON_ELEMENT @JsonValue +.endc + namespace TraditionalBridge.Test.smc @@ -32,12 +39,12 @@ namespace TraditionalBridge.Test.smc protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL IN p1 A50) @@ -56,19 +63,19 @@ namespace TraditionalBridge.Test.smc ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL IN p1 A50) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 2 (OPTIONAL IN p2 D5) - arg2 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetDecimal(arguments[2]) ;;Argument 3 (OPTIONAL IN p3 D10.3) - arg3 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetImplied(arguments[3]) ;;Argument 4 (OPTIONAL IN p4 I4) - arg4 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[4]) + arg4 = dispatcher.GetInt(arguments[4]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -92,12 +99,12 @@ namespace TraditionalBridge.Test.smc protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL INOUT p1 D12.2) @@ -128,37 +135,37 @@ namespace TraditionalBridge.Test.smc ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL INOUT p1 D12.2) - arg1 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetImplied(arguments[1]) ;;Argument 2 (OPTIONAL INOUT p2 D10.5) - arg2 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetImplied(arguments[2]) ;;Argument 3 (OPTIONAL IN p3 D10.5) - arg3 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetImplied(arguments[3]) ;;Argument 4 (OPTIONAL IN p4 D10.2) - arg4 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[4]) + arg4 = dispatcher.GetImplied(arguments[4]) ;;Argument 5 (OPTIONAL IN p5 D10) - arg5 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[5]) + arg5 = dispatcher.GetDecimal(arguments[5]) ;;Argument 6 (OPTIONAL INOUT p6 D7.7) - arg6 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[6]) + arg6 = dispatcher.GetImplied(arguments[6]) ;;Argument 7 (OPTIONAL IN p7 D5.4) - arg7 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[7]) + arg7 = dispatcher.GetImplied(arguments[7]) ;;Argument 8 (OPTIONAL INOUT p8 D8) - arg8 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[8]) + arg8 = dispatcher.GetDecimal(arguments[8]) ;;Argument 9 (OPTIONAL INOUT p9 D7.1) - arg9 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[9]) + arg9 = dispatcher.GetImplied(arguments[9]) ;;Argument 10 (OPTIONAL IN p10 D9) - arg10 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[10]) + arg10 = dispatcher.GetDecimal(arguments[10]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -207,12 +214,12 @@ namespace TraditionalBridge.Test.smc protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL INOUT p1 A30) @@ -231,19 +238,19 @@ namespace TraditionalBridge.Test.smc ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL INOUT p1 A30) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 2 (OPTIONAL INOUT p2 A30) - arg2 = dispatcher.GetText((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetText(arguments[2]) ;;Argument 3 (OPTIONAL INOUT p3 A10) - arg3 = dispatcher.GetText((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetText(arguments[3]) ;;Argument 4 (OPTIONAL INOUT p4 A50) - arg4 = dispatcher.GetText((@JsonObject)arguments.arrayValues[4]) + arg4 = dispatcher.GetText(arguments[4]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -287,12 +294,12 @@ namespace TraditionalBridge.Test.smc protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL INOUT p1 A5) @@ -306,19 +313,19 @@ namespace TraditionalBridge.Test.smc ;;Argument 5 (OPTIONAL INOUT p5 D6.3) arg5, d6.3 ;;Argument 6 (OPTIONAL INOUT p6 [*]D5) - arg6Array, @JsonArray + arg6Array, JSON_ELEMENT arg6Handle, D_HANDLE arg6HandlePos, int ;;Argument 7 (OPTIONAL INOUT p7 [*]A20) - arg7Array, @JsonArray + arg7Array, JSON_ELEMENT arg7Handle, D_HANDLE arg7HandlePos, int ;;Argument 8 (OPTIONAL INOUT p8 [*]D10.3) - arg8Array, @JsonArray + arg8Array, JSON_ELEMENT arg8Handle, D_HANDLE arg8HandlePos, int ;;Argument 9 (OPTIONAL INOUT p9 [*]I4) - arg9Array, @JsonArray + arg9Array, JSON_ELEMENT arg9Handle, D_HANDLE arg9HandlePos, int endrecord @@ -349,48 +356,48 @@ namespace TraditionalBridge.Test.smc ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL INOUT p1 A5) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 2 (OPTIONAL INOUT p2 I4) - arg2 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetInt(arguments[2]) ;;Argument 3 (OPTIONAL INOUT p3 D6) - arg3 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetDecimal(arguments[3]) ;;Argument 4 (OPTIONAL IN p4 A5) - arg4 = dispatcher.GetText((@JsonObject)arguments.arrayValues[4]) + arg4 = dispatcher.GetText(arguments[4]) ;;Argument 5 (OPTIONAL INOUT p5 D6.3) - arg5 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[5]) + arg5 = dispatcher.GetImplied(arguments[5]) ;;Argument 6 (OPTIONAL INOUT p6 [*]D5) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[6], 5) - arg6Array = (@JsonArray)((@JsonObject)arguments.arrayValues[6]).GetProperty("PassedValue") - arg6Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg6Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[6], 5) + arg6Array = arguments[6].GetProperty("PassedValue") + arg6Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg6Array.GetArrayLength()) arg6HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg6Handle),argumentDefinition,arg6HandlePos,arg6Array) ;;Argument 7 (OPTIONAL INOUT p7 [*]A20) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[7], 20) - arg7Array = (@JsonArray)((@JsonObject)arguments.arrayValues[7]).GetProperty("PassedValue") - arg7Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg7Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[7], 20) + arg7Array = arguments[7].GetProperty("PassedValue") + arg7Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg7Array.GetArrayLength()) arg7HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg7Handle),argumentDefinition,arg7HandlePos,arg7Array) ;;Argument 8 (OPTIONAL INOUT p8 [*]D10.3) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[8], 10) - arg8Array = (@JsonArray)((@JsonObject)arguments.arrayValues[8]).GetProperty("PassedValue") - arg8Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg8Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[8], 10) + arg8Array = arguments[8].GetProperty("PassedValue") + arg8Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg8Array.GetArrayLength()) arg8HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg8Handle),argumentDefinition,arg8HandlePos,arg8Array) ;;Argument 9 (OPTIONAL INOUT p9 [*]I4) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[9], 4) - arg9Array = (@JsonArray)((@JsonObject)arguments.arrayValues[9]).GetProperty("PassedValue") - arg9Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg9Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[9], 4) + arg9Array = arguments[9].GetProperty("PassedValue") + arg9Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg9Array.GetArrayLength()) arg9HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg9Handle),argumentDefinition,arg9HandlePos,arg9Array) @@ -456,12 +463,12 @@ namespace TraditionalBridge.Test.smc protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL INOUT p1 A5) @@ -477,13 +484,13 @@ namespace TraditionalBridge.Test.smc ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL INOUT p1 A5) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 2 (OPTIONAL INOUT p2 A5) - arg2 = dispatcher.GetText((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetText(arguments[2]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -520,12 +527,12 @@ namespace TraditionalBridge.Test.smc protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL IN p1 A5) @@ -541,13 +548,13 @@ namespace TraditionalBridge.Test.smc ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL IN p1 A5) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 2 (OPTIONAL INOUT p2 A5) - arg2 = dispatcher.GetText((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetText(arguments[2]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -579,12 +586,12 @@ namespace TraditionalBridge.Test.smc protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT verno A30) @@ -597,10 +604,10 @@ namespace TraditionalBridge.Test.smc ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT verno A30) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine diff --git a/TraditionalBridge.Test/MethodDispatchers/strtestsMethodDispachers.dbl b/TraditionalBridge.Test/MethodDispatchers/strtestsMethodDispachers.dbl index 59da7758..a1a1a90b 100644 --- a/TraditionalBridge.Test/MethodDispatchers/strtestsMethodDispachers.dbl +++ b/TraditionalBridge.Test/MethodDispatchers/strtestsMethodDispachers.dbl @@ -15,6 +15,13 @@ import Harmony.TraditionalBridge import System.Collections import TraditionalBridge.Test.Models +.ifdef DBLV11 +import System.Text.Json +.define JSON_ELEMENT @JsonElement +.else +.define JSON_ELEMENT @JsonValue +.endc + namespace TraditionalBridge.Test.strtests @@ -34,12 +41,12 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT SINGLEIMPLIEDDECIMAL structure @Singleimplieddecimal) @@ -53,11 +60,11 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT SINGLEIMPLIEDDECIMAL structure @Singleimplieddecimal) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mSingleimplieddecimalMetadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mSingleimplieddecimalMetadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -90,12 +97,12 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT IMPLIEDDECIMALTEST structure @Implieddecimaltest) @@ -109,11 +116,11 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT IMPLIEDDECIMALTEST structure @Implieddecimaltest) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mImplieddecimaltestMetadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mImplieddecimaltestMetadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -146,12 +153,12 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT SALESMAN structure @Salesman) @@ -197,12 +204,12 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT MANAGE_FUNDS structure @ManageFund) @@ -217,11 +224,11 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT MANAGE_FUNDS structure @ManageFund) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mManageFundMetadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mManageFundMetadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -257,12 +264,12 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT p1 structure @Dbauthor) @@ -276,11 +283,11 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT p1 structure @Dbauthor) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mDbauthorMetadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mDbauthorMetadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -315,20 +322,20 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN ADDRESS [*]structure @Addres) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1Handle, D_HANDLE arg1HandlePos, int ;;Argument 2 (REQUIRED IN PERFSTRUCT [*]structure @Perfstruct) - arg2Array, @JsonArray + arg2Array, JSON_ELEMENT arg2Handle, D_HANDLE arg2HandlePos, int endrecord @@ -349,19 +356,19 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN ADDRESS [*]structure @Addres) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 182) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") - arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 182) + arg1Array = arguments[1].GetProperty("PassedValue") + arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.GetArrayLength()) arg1HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg1Handle),argumentDefinition,arg1HandlePos,arg1Array) ;;Argument 2 (REQUIRED IN PERFSTRUCT [*]structure @Perfstruct) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[2], 72) - arg2Array = (@JsonArray)((@JsonObject)arguments.arrayValues[2]).GetProperty("PassedValue") - arg2Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg2Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[2], 72) + arg2Array = arguments[2].GetProperty("PassedValue") + arg2Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg2Array.GetArrayLength()) arg2HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg2Handle),argumentDefinition,arg2HandlePos,arg2Array) @@ -387,12 +394,12 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT num I4) @@ -436,12 +443,12 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT PERFSTRUCT [*]structure @Perfstruct) @@ -491,16 +498,16 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN PERFSTRUCT [*]structure @Perfstruct) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1Handle, D_HANDLE arg1HandlePos, int ;;Argument 2 (REQUIRED IN Count I4) @@ -518,17 +525,17 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN PERFSTRUCT [*]structure @Perfstruct) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 72) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") - arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 72) + arg1Array = arguments[1].GetProperty("PassedValue") + arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.GetArrayLength()) arg1HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg1Handle),argumentDefinition,arg1HandlePos,arg1Array) ;;Argument 2 (REQUIRED IN Count I4) - arg2 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetInt(arguments[2]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -554,16 +561,16 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT PERFSTRUCT [*]structure @Perfstruct) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1Handle, D_HANDLE arg1HandlePos, int ;;Argument 2 (REQUIRED INOUT Count I4) @@ -581,17 +588,17 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT PERFSTRUCT [*]structure @Perfstruct) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 72) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") - arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 72) + arg1Array = arguments[1].GetProperty("PassedValue") + arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.GetArrayLength()) arg1HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg1Handle),argumentDefinition,arg1HandlePos,arg1Array) ;;Argument 2 (REQUIRED INOUT Count I4) - arg2 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetInt(arguments[2]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -627,12 +634,12 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT PERFSTRUCT [*]structure @Perfstruct) @@ -689,16 +696,16 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN PERFSTRUCT [*]structure @Perfstruct) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1Handle, D_HANDLE arg1HandlePos, int ;;Argument 2 (REQUIRED IN cnt I4) @@ -716,17 +723,17 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN PERFSTRUCT [*]structure @Perfstruct) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 72) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") - arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 72) + arg1Array = arguments[1].GetProperty("PassedValue") + arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.GetArrayLength()) arg1HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg1Handle),argumentDefinition,arg1HandlePos,arg1Array) ;;Argument 2 (REQUIRED IN cnt I4) - arg2 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetInt(arguments[2]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -754,12 +761,12 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN TR_SYNINS_INP structure @TrSyninsInp) @@ -784,15 +791,15 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN TR_SYNINS_INP structure @TrSyninsInp) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mTrSyninsInpMetadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mTrSyninsInpMetadata) arg1 = arg1DataObject.SynergyRecord ;;Argument 3 (REQUIRED INOUT elementcount I4) - arg3 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetInt(arguments[3]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -831,12 +838,12 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT REFCOUNT structure @Refcount) @@ -850,11 +857,11 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT REFCOUNT structure @Refcount) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mRefcountMetadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mRefcountMetadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -887,12 +894,12 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT STRTEST1 structure @Strtest1) @@ -906,11 +913,11 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT STRTEST1 structure @Strtest1) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mStrtest1Metadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mStrtest1Metadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -945,19 +952,19 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT strtest4 structure @Strtest4) arg1DataObject, @DataObjectBase arg1, strStrtest4 ;;Argument 2 (REQUIRED INOUT STRTEST3 [*]structure @Strtest3) - arg2Array, @JsonArray + arg2Array, JSON_ELEMENT arg2Handle, D_HANDLE arg2HandlePos, int endrecord @@ -973,17 +980,17 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT strtest4 structure @Strtest4) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mStrtest4Metadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mStrtest4Metadata) arg1 = arg1DataObject.SynergyRecord ;;Argument 2 (REQUIRED INOUT STRTEST3 [*]structure @Strtest3) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[2], 58) - arg2Array = (@JsonArray)((@JsonObject)arguments.arrayValues[2]).GetProperty("PassedValue") - arg2Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg2Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[2], 58) + arg2Array = arguments[2].GetProperty("PassedValue") + arg2Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg2Array.GetArrayLength()) arg2HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg2Handle),argumentDefinition,arg2HandlePos,arg2Array) @@ -1024,16 +1031,16 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT STRTEST3 [*]structure @Strtest3) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1Handle, D_HANDLE arg1HandlePos, int ;;Argument 2 (REQUIRED INOUT STRTEST4 structure @Strtest4) @@ -1052,18 +1059,18 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT STRTEST3 [*]structure @Strtest3) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 58) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") - arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 58) + arg1Array = arguments[1].GetProperty("PassedValue") + arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.GetArrayLength()) arg1HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg1Handle),argumentDefinition,arg1HandlePos,arg1Array) ;;Argument 2 (REQUIRED INOUT STRTEST4 structure @Strtest4) ;;Structure argument. Get the data object then get the record from it - arg2DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[2],mStrtest4Metadata) + arg2DataObject = dispatcher.DeserializeObject(arguments[2],mStrtest4Metadata) arg2 = arg2DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -1101,12 +1108,12 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT strtest12 structure @Strtest12) @@ -1120,11 +1127,11 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT strtest12 structure @Strtest12) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mStrtest12Metadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mStrtest12Metadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -1157,16 +1164,16 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT strtest12 [*]structure @Strtest12) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1Handle, D_HANDLE arg1HandlePos, int endrecord @@ -1182,12 +1189,12 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT strtest12 [*]structure @Strtest12) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 56) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") - arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 56) + arg1Array = arguments[1].GetProperty("PassedValue") + arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.GetArrayLength()) arg1HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg1Handle),argumentDefinition,arg1HandlePos,arg1Array) @@ -1220,12 +1227,12 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT strtest14 structure @Strtest14) @@ -1239,11 +1246,11 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT strtest14 structure @Strtest14) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mStrtest14Metadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mStrtest14Metadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -1276,12 +1283,12 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT STRTEST16 structure @Strtest16) @@ -1295,11 +1302,11 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT STRTEST16 structure @Strtest16) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mStrtest16Metadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mStrtest16Metadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -1332,12 +1339,12 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT strtest18 structure @Strtest18) @@ -1351,11 +1358,11 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT strtest18 structure @Strtest18) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mStrtest18Metadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mStrtest18Metadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -1388,12 +1395,12 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT strtest19 structure @Strtest19) @@ -1407,11 +1414,11 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT strtest19 structure @Strtest19) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mStrtest19Metadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mStrtest19Metadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -1444,12 +1451,12 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT strtest2 structure @Strtest2) @@ -1463,11 +1470,11 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT strtest2 structure @Strtest2) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mStrtest2Metadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mStrtest2Metadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -1500,12 +1507,12 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT strtest19 structure @Strtest19) @@ -1520,11 +1527,11 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT strtest19 structure @Strtest19) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mStrtest19Metadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mStrtest19Metadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -1562,12 +1569,12 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN strtest1 structure @Strtest1) @@ -1584,16 +1591,16 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN strtest1 structure @Strtest1) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mStrtest1Metadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mStrtest1Metadata) arg1 = arg1DataObject.SynergyRecord ;;Argument 2 (REQUIRED INOUT strtest3 structure @Strtest3) ;;Structure argument. Get the data object then get the record from it - arg2DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[2],mStrtest3Metadata) + arg2DataObject = dispatcher.DeserializeObject(arguments[2],mStrtest3Metadata) arg2 = arg2DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -1628,12 +1635,12 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT strtest1 structure @Strtest1) @@ -1650,16 +1657,16 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT strtest1 structure @Strtest1) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mStrtest1Metadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mStrtest1Metadata) arg1 = arg1DataObject.SynergyRecord ;;Argument 2 (REQUIRED IN strtest3 structure @Strtest3) ;;Structure argument. Get the data object then get the record from it - arg2DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[2],mStrtest3Metadata) + arg2DataObject = dispatcher.DeserializeObject(arguments[2],mStrtest3Metadata) arg2 = arg2DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -1692,12 +1699,12 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT strtest23 structure @Strtest23) @@ -1712,11 +1719,11 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT strtest23 structure @Strtest23) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mStrtest23Metadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mStrtest23Metadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -1752,12 +1759,12 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT strtest24 structure @Strtest24) @@ -1772,11 +1779,11 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT strtest24 structure @Strtest24) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mStrtest24Metadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mStrtest24Metadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -1812,12 +1819,12 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT STRTEST25 structure @Strtest25) @@ -1831,11 +1838,11 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT STRTEST25 structure @Strtest25) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mStrtest25Metadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mStrtest25Metadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -1868,12 +1875,12 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT STRTEST27 structure @Strtest27) @@ -1887,11 +1894,11 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT STRTEST27 structure @Strtest27) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mStrtest27Metadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mStrtest27Metadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -1924,12 +1931,12 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN ordnum A10) @@ -1946,14 +1953,14 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN ordnum A10) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 2 (REQUIRED INOUT DBORDER structure @Dborder) ;;Structure argument. Get the data object then get the record from it - arg2DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[2],mDborderMetadata) + arg2DataObject = dispatcher.DeserializeObject(arguments[2],mDborderMetadata) arg2 = arg2DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -1989,12 +1996,12 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT strtest3 structure @Strtest3) @@ -2008,11 +2015,11 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT strtest3 structure @Strtest3) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mStrtest3Metadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mStrtest3Metadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -2045,16 +2052,16 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT STRTEST30 [*]structure @Strtest30) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1Handle, D_HANDLE arg1HandlePos, int endrecord @@ -2070,12 +2077,12 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT STRTEST30 [*]structure @Strtest30) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 127) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") - arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 127) + arg1Array = arguments[1].GetProperty("PassedValue") + arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.GetArrayLength()) arg1HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg1Handle),argumentDefinition,arg1HandlePos,arg1Array) @@ -2108,16 +2115,16 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT STRTEST31 [*]structure @Strtest31) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1Handle, D_HANDLE arg1HandlePos, int endrecord @@ -2133,12 +2140,12 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT STRTEST31 [*]structure @Strtest31) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 24) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") - arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 24) + arg1Array = arguments[1].GetProperty("PassedValue") + arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.GetArrayLength()) arg1HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg1Handle),argumentDefinition,arg1HandlePos,arg1Array) @@ -2171,12 +2178,12 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT DATASET structure @Dataset) @@ -2190,11 +2197,11 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT DATASET structure @Dataset) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mDatasetMetadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mDatasetMetadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -2227,12 +2234,12 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT strtest4 structure @Strtest4) @@ -2246,11 +2253,11 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT strtest4 structure @Strtest4) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mStrtest4Metadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mStrtest4Metadata) arg1 = arg1DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -2285,12 +2292,12 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT strtest1 structure @Strtest1) @@ -2307,16 +2314,16 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT strtest1 structure @Strtest1) ;;Structure argument. Get the data object then get the record from it - arg1DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[1],mStrtest1Metadata) + arg1DataObject = dispatcher.DeserializeObject(arguments[1],mStrtest1Metadata) arg1 = arg1DataObject.SynergyRecord ;;Argument 2 (REQUIRED INOUT strtest3 structure @Strtest3) ;;Structure argument. Get the data object then get the record from it - arg2DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[2],mStrtest3Metadata) + arg2DataObject = dispatcher.DeserializeObject(arguments[2],mStrtest3Metadata) arg2 = arg2DataObject.SynergyRecord ;;------------------------------------------------------------ @@ -2357,12 +2364,12 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT p1 A6) @@ -2385,26 +2392,26 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT p1 A6) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 2 (REQUIRED INOUT strtest1 structure @Strtest1) ;;Structure argument. Get the data object then get the record from it - arg2DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[2],mStrtest1Metadata) + arg2DataObject = dispatcher.DeserializeObject(arguments[2],mStrtest1Metadata) arg2 = arg2DataObject.SynergyRecord ;;Argument 3 (REQUIRED INOUT p3 D5) - arg3 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetDecimal(arguments[3]) ;;Argument 4 (REQUIRED INOUT strtest3 structure @Strtest3) ;;Structure argument. Get the data object then get the record from it - arg4DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[4],mStrtest3Metadata) + arg4DataObject = dispatcher.DeserializeObject(arguments[4],mStrtest3Metadata) arg4 = arg4DataObject.SynergyRecord ;;Argument 5 (REQUIRED INOUT p5 D5) - arg5 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[5]) + arg5 = dispatcher.GetDecimal(arguments[5]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -2457,16 +2464,16 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT strtest7 [*]structure @Strtest7) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1Handle, D_HANDLE arg1HandlePos, int endrecord @@ -2482,12 +2489,12 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT strtest7 [*]structure @Strtest7) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 10) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") - arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 10) + arg1Array = arguments[1].GetProperty("PassedValue") + arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.GetArrayLength()) arg1HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg1Handle),argumentDefinition,arg1HandlePos,arg1Array) @@ -2520,16 +2527,16 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT strtest3 [*]structure @Strtest3) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1Handle, D_HANDLE arg1HandlePos, int endrecord @@ -2545,12 +2552,12 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT strtest3 [*]structure @Strtest3) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 58) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") - arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 58) + arg1Array = arguments[1].GetProperty("PassedValue") + arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.GetArrayLength()) arg1HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg1Handle),argumentDefinition,arg1HandlePos,arg1Array) @@ -2583,18 +2590,18 @@ namespace TraditionalBridge.Test.strtests protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT p1de7 D7) arg1, d7 ;;Argument 2 (REQUIRED INOUT strtest3 [*]structure @Strtest3) - arg2Array, @JsonArray + arg2Array, JSON_ELEMENT arg2Handle, D_HANDLE arg2HandlePos, int ;;Argument 3 (REQUIRED INOUT p3al10 A10) @@ -2612,20 +2619,20 @@ namespace TraditionalBridge.Test.strtests ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT p1de7 D7) - arg1 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetDecimal(arguments[1]) ;;Argument 2 (REQUIRED INOUT strtest3 [*]structure @Strtest3) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[2], 58) - arg2Array = (@JsonArray)((@JsonObject)arguments.arrayValues[2]).GetProperty("PassedValue") - arg2Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg2Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[2], 58) + arg2Array = arguments[2].GetProperty("PassedValue") + arg2Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg2Array.GetArrayLength()) arg2HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg2Handle),argumentDefinition,arg2HandlePos,arg2Array) ;;Argument 3 (REQUIRED INOUT p3al10 A10) - arg3 = dispatcher.GetText((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetText(arguments[3]) ;;------------------------------------------------------------ ;; Call the underlying routine diff --git a/TraditionalBridge.Test/MethodDispatchers/syntstMethodDispachers.dbl b/TraditionalBridge.Test/MethodDispatchers/syntstMethodDispachers.dbl index b2f93bca..72c7801c 100644 --- a/TraditionalBridge.Test/MethodDispatchers/syntstMethodDispachers.dbl +++ b/TraditionalBridge.Test/MethodDispatchers/syntstMethodDispachers.dbl @@ -15,6 +15,13 @@ import Harmony.TraditionalBridge import System.Collections import TraditionalBridge.Test.Models +.ifdef DBLV11 +import System.Text.Json +.define JSON_ELEMENT @JsonElement +.else +.define JSON_ELEMENT @JsonValue +.endc + namespace TraditionalBridge.Test.syntst @@ -32,12 +39,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN p1 A5) @@ -81,7 +88,7 @@ namespace TraditionalBridge.Test.syntst ;;Argument 20 (REQUIRED IN p20 A5) arg20, a5 ;;Argument 21 (REQUIRED INOUT p21 [*]A7) - arg21Array, @JsonArray + arg21Array, JSON_ELEMENT arg21Handle, D_HANDLE arg21HandlePos, int ;;Argument 22 (REQUIRED IN p22 A5) @@ -99,77 +106,77 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN p1 A5) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 2 (REQUIRED IN p2 A5) - arg2 = dispatcher.GetText((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetText(arguments[2]) ;;Argument 3 (REQUIRED IN p3 A5) - arg3 = dispatcher.GetText((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetText(arguments[3]) ;;Argument 4 (REQUIRED IN p4 A5) - arg4 = dispatcher.GetText((@JsonObject)arguments.arrayValues[4]) + arg4 = dispatcher.GetText(arguments[4]) ;;Argument 5 (REQUIRED IN p5 A5) - arg5 = dispatcher.GetText((@JsonObject)arguments.arrayValues[5]) + arg5 = dispatcher.GetText(arguments[5]) ;;Argument 6 (REQUIRED IN p6 A5) - arg6 = dispatcher.GetText((@JsonObject)arguments.arrayValues[6]) + arg6 = dispatcher.GetText(arguments[6]) ;;Argument 7 (REQUIRED IN p7 A5) - arg7 = dispatcher.GetText((@JsonObject)arguments.arrayValues[7]) + arg7 = dispatcher.GetText(arguments[7]) ;;Argument 8 (REQUIRED IN p8 A5) - arg8 = dispatcher.GetText((@JsonObject)arguments.arrayValues[8]) + arg8 = dispatcher.GetText(arguments[8]) ;;Argument 9 (REQUIRED IN p9 A5) - arg9 = dispatcher.GetText((@JsonObject)arguments.arrayValues[9]) + arg9 = dispatcher.GetText(arguments[9]) ;;Argument 10 (REQUIRED IN p10 A5) - arg10 = dispatcher.GetText((@JsonObject)arguments.arrayValues[10]) + arg10 = dispatcher.GetText(arguments[10]) ;;Argument 11 (REQUIRED IN p11 A5) - arg11 = dispatcher.GetText((@JsonObject)arguments.arrayValues[11]) + arg11 = dispatcher.GetText(arguments[11]) ;;Argument 12 (REQUIRED IN p12 A5) - arg12 = dispatcher.GetText((@JsonObject)arguments.arrayValues[12]) + arg12 = dispatcher.GetText(arguments[12]) ;;Argument 13 (REQUIRED IN p13 A5) - arg13 = dispatcher.GetText((@JsonObject)arguments.arrayValues[13]) + arg13 = dispatcher.GetText(arguments[13]) ;;Argument 14 (REQUIRED IN p14 A5) - arg14 = dispatcher.GetText((@JsonObject)arguments.arrayValues[14]) + arg14 = dispatcher.GetText(arguments[14]) ;;Argument 15 (REQUIRED IN p15 A5) - arg15 = dispatcher.GetText((@JsonObject)arguments.arrayValues[15]) + arg15 = dispatcher.GetText(arguments[15]) ;;Argument 16 (REQUIRED IN p16 A5) - arg16 = dispatcher.GetText((@JsonObject)arguments.arrayValues[16]) + arg16 = dispatcher.GetText(arguments[16]) ;;Argument 17 (REQUIRED IN p17 A5) - arg17 = dispatcher.GetText((@JsonObject)arguments.arrayValues[17]) + arg17 = dispatcher.GetText(arguments[17]) ;;Argument 18 (REQUIRED IN p18 A5) - arg18 = dispatcher.GetText((@JsonObject)arguments.arrayValues[18]) + arg18 = dispatcher.GetText(arguments[18]) ;;Argument 19 (REQUIRED IN p19 A5) - arg19 = dispatcher.GetText((@JsonObject)arguments.arrayValues[19]) + arg19 = dispatcher.GetText(arguments[19]) ;;Argument 20 (REQUIRED IN p20 A5) - arg20 = dispatcher.GetText((@JsonObject)arguments.arrayValues[20]) + arg20 = dispatcher.GetText(arguments[20]) ;;Argument 21 (REQUIRED INOUT p21 [*]A7) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[21], 7) - arg21Array = (@JsonArray)((@JsonObject)arguments.arrayValues[21]).GetProperty("PassedValue") - arg21Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg21Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[21], 7) + arg21Array = arguments[21].GetProperty("PassedValue") + arg21Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg21Array.GetArrayLength()) arg21HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg21Handle),argumentDefinition,arg21HandlePos,arg21Array) ;;Argument 22 (REQUIRED IN p22 A5) - arg22 = dispatcher.GetText((@JsonObject)arguments.arrayValues[22]) + arg22 = dispatcher.GetText(arguments[22]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -198,12 +205,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL INOUT param1 A5) @@ -222,19 +229,19 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL INOUT param1 A5) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 2 (OPTIONAL INOUT param2 A5) - arg2 = dispatcher.GetText((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetText(arguments[2]) ;;Argument 3 (OPTIONAL INOUT param3 A5) - arg3 = dispatcher.GetText((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetText(arguments[3]) ;;Argument 4 (OPTIONAL INOUT param4 A5) - arg4 = dispatcher.GetText((@JsonObject)arguments.arrayValues[4]) + arg4 = dispatcher.GetText(arguments[4]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -278,12 +285,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL INOUT p1 A30) @@ -302,19 +309,19 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL INOUT p1 A30) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 2 (OPTIONAL INOUT p2 A30) - arg2 = dispatcher.GetText((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetText(arguments[2]) ;;Argument 3 (OPTIONAL INOUT p3 A10) - arg3 = dispatcher.GetText((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetText(arguments[3]) ;;Argument 4 (OPTIONAL INOUT p4 A5) - arg4 = dispatcher.GetText((@JsonObject)arguments.arrayValues[4]) + arg4 = dispatcher.GetText(arguments[4]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -358,12 +365,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL INOUT param1 A5) @@ -379,13 +386,13 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL INOUT param1 A5) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 2 (OPTIONAL IN param2 A5) - arg2 = dispatcher.GetText((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetText(arguments[2]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -417,12 +424,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL IN p1 A5) @@ -438,13 +445,13 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL IN p1 A5) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 2 (OPTIONAL INOUT p2 A5) - arg2 = dispatcher.GetText((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetText(arguments[2]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -476,16 +483,16 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL INOUT p1 [*]A20) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1Handle, D_HANDLE arg1HandlePos, int endrecord @@ -501,12 +508,12 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL INOUT p1 [*]A20) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 20) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") - arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 20) + arg1Array = arguments[1].GetProperty("PassedValue") + arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.GetArrayLength()) arg1HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg1Handle),argumentDefinition,arg1HandlePos,arg1Array) @@ -537,12 +544,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL INOUT p1 D14) @@ -567,28 +574,28 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL INOUT p1 D14) - arg1 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetDecimal(arguments[1]) ;;Argument 2 (OPTIONAL INOUT p2 D10) - arg2 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetDecimal(arguments[2]) ;;Argument 3 (OPTIONAL INOUT p3 D7) - arg3 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetDecimal(arguments[3]) ;;Argument 4 (OPTIONAL INOUT p4 D10) - arg4 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[4]) + arg4 = dispatcher.GetDecimal(arguments[4]) ;;Argument 5 (OPTIONAL INOUT p5 D7) - arg5 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[5]) + arg5 = dispatcher.GetDecimal(arguments[5]) ;;Argument 6 (OPTIONAL IN p6 D4) - arg6 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[6]) + arg6 = dispatcher.GetDecimal(arguments[6]) ;;Argument 7 (OPTIONAL IN p7 D8) - arg7 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[7]) + arg7 = dispatcher.GetDecimal(arguments[7]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -637,12 +644,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL INOUT p1 A10) @@ -661,19 +668,19 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL INOUT p1 A10) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 2 (OPTIONAL INOUT p2 A7) - arg2 = dispatcher.GetText((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetText(arguments[2]) ;;Argument 3 (OPTIONAL INOUT p3 A10) - arg3 = dispatcher.GetText((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetText(arguments[3]) ;;Argument 4 (OPTIONAL INOUT p4 A13) - arg4 = dispatcher.GetText((@JsonObject)arguments.arrayValues[4]) + arg4 = dispatcher.GetText(arguments[4]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -717,12 +724,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL INOUT param1 A5) @@ -742,19 +749,19 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL INOUT param1 A5) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 2 (OPTIONAL INOUT param2 A30) - arg2 = dispatcher.GetText((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetText(arguments[2]) ;;Argument 3 (OPTIONAL INOUT param3 A8) - arg3 = dispatcher.GetText((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetText(arguments[3]) ;;Argument 4 (OPTIONAL IN param4 A1) - arg4 = dispatcher.GetText((@JsonObject)arguments.arrayValues[4]) + arg4 = dispatcher.GetText(arguments[4]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -796,12 +803,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL INOUT p1 I4) @@ -814,10 +821,10 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL INOUT p1 I4) - arg1 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetInt(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -846,12 +853,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL IN param1 I4) @@ -868,16 +875,16 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL IN param1 I4) - arg1 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetInt(arguments[1]) ;;Argument 2 (OPTIONAL IN param2 I1) - arg2 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetInt(arguments[2]) ;;Argument 3 (OPTIONAL IN param3 I1) - arg3 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetInt(arguments[3]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -901,12 +908,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL IN param1 I1) @@ -947,52 +954,52 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL IN param1 I1) - arg1 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetInt(arguments[1]) ;;Argument 2 (OPTIONAL IN param2 I2) - arg2 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetInt(arguments[2]) ;;Argument 3 (OPTIONAL IN param3 I4) - arg3 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetInt(arguments[3]) ;;Argument 4 (OPTIONAL IN param4 I4) - arg4 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[4]) + arg4 = dispatcher.GetInt(arguments[4]) ;;Argument 5 (OPTIONAL IN param5 I1) - arg5 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[5]) + arg5 = dispatcher.GetInt(arguments[5]) ;;Argument 6 (OPTIONAL IN param6 I1) - arg6 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[6]) + arg6 = dispatcher.GetInt(arguments[6]) ;;Argument 7 (OPTIONAL IN param7 I2) - arg7 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[7]) + arg7 = dispatcher.GetInt(arguments[7]) ;;Argument 8 (OPTIONAL IN param8 I4) - arg8 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[8]) + arg8 = dispatcher.GetInt(arguments[8]) ;;Argument 9 (OPTIONAL IN param9 I4) - arg9 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[9]) + arg9 = dispatcher.GetInt(arguments[9]) ;;Argument 10 (OPTIONAL IN param10 I1) - arg10 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[10]) + arg10 = dispatcher.GetInt(arguments[10]) ;;Argument 11 (OPTIONAL IN param11 I1) - arg11 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[11]) + arg11 = dispatcher.GetInt(arguments[11]) ;;Argument 12 (OPTIONAL IN param12 I2) - arg12 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[12]) + arg12 = dispatcher.GetInt(arguments[12]) ;;Argument 13 (OPTIONAL IN param13 I4) - arg13 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[13]) + arg13 = dispatcher.GetInt(arguments[13]) ;;Argument 14 (OPTIONAL IN param14 I4) - arg14 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[14]) + arg14 = dispatcher.GetInt(arguments[14]) ;;Argument 15 (OPTIONAL IN param15 I1) - arg15 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[15]) + arg15 = dispatcher.GetInt(arguments[15]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -1016,12 +1023,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL IN param1 I1) @@ -1062,52 +1069,52 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL IN param1 I1) - arg1 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetInt(arguments[1]) ;;Argument 2 (OPTIONAL IN param2 I2) - arg2 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetInt(arguments[2]) ;;Argument 3 (OPTIONAL IN param3 I4) - arg3 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetInt(arguments[3]) ;;Argument 4 (OPTIONAL IN param4 I8) - arg4 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[4]) + arg4 = dispatcher.GetInt(arguments[4]) ;;Argument 5 (OPTIONAL IN param5 I1) - arg5 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[5]) + arg5 = dispatcher.GetInt(arguments[5]) ;;Argument 6 (OPTIONAL IN param6 I1) - arg6 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[6]) + arg6 = dispatcher.GetInt(arguments[6]) ;;Argument 7 (OPTIONAL IN param7 I2) - arg7 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[7]) + arg7 = dispatcher.GetInt(arguments[7]) ;;Argument 8 (OPTIONAL IN param8 I4) - arg8 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[8]) + arg8 = dispatcher.GetInt(arguments[8]) ;;Argument 9 (OPTIONAL IN param9 I8) - arg9 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[9]) + arg9 = dispatcher.GetInt(arguments[9]) ;;Argument 10 (OPTIONAL IN param10 I1) - arg10 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[10]) + arg10 = dispatcher.GetInt(arguments[10]) ;;Argument 11 (OPTIONAL IN param11 I1) - arg11 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[11]) + arg11 = dispatcher.GetInt(arguments[11]) ;;Argument 12 (OPTIONAL IN param12 I2) - arg12 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[12]) + arg12 = dispatcher.GetInt(arguments[12]) ;;Argument 13 (OPTIONAL IN param13 I4) - arg13 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[13]) + arg13 = dispatcher.GetInt(arguments[13]) ;;Argument 14 (OPTIONAL IN param14 I8) - arg14 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[14]) + arg14 = dispatcher.GetInt(arguments[14]) ;;Argument 15 (OPTIONAL IN param15 I1) - arg15 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[15]) + arg15 = dispatcher.GetInt(arguments[15]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -1131,12 +1138,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL IN param1 D1) @@ -1179,55 +1186,55 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL IN param1 D1) - arg1 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetDecimal(arguments[1]) ;;Argument 2 (OPTIONAL IN param2 D3) - arg2 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetDecimal(arguments[2]) ;;Argument 3 (OPTIONAL IN param3 D4.2) - arg3 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetImplied(arguments[3]) ;;Argument 4 (OPTIONAL IN param4 D2.2) - arg4 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[4]) + arg4 = dispatcher.GetImplied(arguments[4]) ;;Argument 5 (OPTIONAL IN param5 D1) - arg5 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[5]) + arg5 = dispatcher.GetDecimal(arguments[5]) ;;Argument 6 (OPTIONAL IN param6 D3) - arg6 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[6]) + arg6 = dispatcher.GetDecimal(arguments[6]) ;;Argument 7 (OPTIONAL IN param7 D4.2) - arg7 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[7]) + arg7 = dispatcher.GetImplied(arguments[7]) ;;Argument 8 (OPTIONAL IN param8 D2.2) - arg8 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[8]) + arg8 = dispatcher.GetImplied(arguments[8]) ;;Argument 9 (OPTIONAL IN param9 D1) - arg9 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[9]) + arg9 = dispatcher.GetDecimal(arguments[9]) ;;Argument 10 (OPTIONAL IN param10 D5) - arg10 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[10]) + arg10 = dispatcher.GetDecimal(arguments[10]) ;;Argument 11 (OPTIONAL IN param11 D6.1) - arg11 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[11]) + arg11 = dispatcher.GetImplied(arguments[11]) ;;Argument 12 (OPTIONAL IN param12 D3.3) - arg12 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[12]) + arg12 = dispatcher.GetImplied(arguments[12]) ;;Argument 13 (OPTIONAL IN param13 D1) - arg13 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[13]) + arg13 = dispatcher.GetDecimal(arguments[13]) ;;Argument 14 (OPTIONAL IN param14 D9) - arg14 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[14]) + arg14 = dispatcher.GetDecimal(arguments[14]) ;;Argument 15 (OPTIONAL IN param15 D10) - arg15 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[15]) + arg15 = dispatcher.GetDecimal(arguments[15]) ;;Argument 16 (OPTIONAL IN param16 D7.1) - arg16 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[16]) + arg16 = dispatcher.GetImplied(arguments[16]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -1251,12 +1258,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL INOUT param1 A1) @@ -1291,43 +1298,43 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL INOUT param1 A1) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 2 (OPTIONAL INOUT param2 A26) - arg2 = dispatcher.GetText((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetText(arguments[2]) ;;Argument 3 (OPTIONAL INOUT param3 A35) - arg3 = dispatcher.GetText((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetText(arguments[3]) ;;Argument 4 (OPTIONAL INOUT param4 A21) - arg4 = dispatcher.GetText((@JsonObject)arguments.arrayValues[4]) + arg4 = dispatcher.GetText(arguments[4]) ;;Argument 5 (OPTIONAL INOUT param5 D1) - arg5 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[5]) + arg5 = dispatcher.GetDecimal(arguments[5]) ;;Argument 6 (OPTIONAL INOUT param6 D6) - arg6 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[6]) + arg6 = dispatcher.GetDecimal(arguments[6]) ;;Argument 7 (OPTIONAL INOUT param7 D7) - arg7 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[7]) + arg7 = dispatcher.GetDecimal(arguments[7]) ;;Argument 8 (OPTIONAL INOUT param8 D4) - arg8 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[8]) + arg8 = dispatcher.GetDecimal(arguments[8]) ;;Argument 9 (OPTIONAL INOUT param9 D1) - arg9 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[9]) + arg9 = dispatcher.GetDecimal(arguments[9]) ;;Argument 10 (OPTIONAL INOUT param10 D9) - arg10 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[10]) + arg10 = dispatcher.GetDecimal(arguments[10]) ;;Argument 11 (OPTIONAL INOUT param11 D10) - arg11 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[11]) + arg11 = dispatcher.GetDecimal(arguments[11]) ;;Argument 12 (OPTIONAL INOUT param12 D7) - arg12 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[12]) + arg12 = dispatcher.GetDecimal(arguments[12]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -1411,12 +1418,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL INOUT param1 I4) @@ -1467,67 +1474,67 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL INOUT param1 I4) - arg1 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetInt(arguments[1]) ;;Argument 2 (OPTIONAL INOUT param2 I1) - arg2 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetInt(arguments[2]) ;;Argument 3 (OPTIONAL INOUT param3 I2) - arg3 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetInt(arguments[3]) ;;Argument 4 (OPTIONAL INOUT param4 I4) - arg4 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[4]) + arg4 = dispatcher.GetInt(arguments[4]) ;;Argument 5 (OPTIONAL INOUT param5 I4) - arg5 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[5]) + arg5 = dispatcher.GetInt(arguments[5]) ;;Argument 6 (OPTIONAL INOUT param6 I4) - arg6 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[6]) + arg6 = dispatcher.GetInt(arguments[6]) ;;Argument 7 (OPTIONAL INOUT param7 I1) - arg7 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[7]) + arg7 = dispatcher.GetInt(arguments[7]) ;;Argument 8 (OPTIONAL INOUT param8 I2) - arg8 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[8]) + arg8 = dispatcher.GetInt(arguments[8]) ;;Argument 9 (OPTIONAL INOUT param9 I4) - arg9 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[9]) + arg9 = dispatcher.GetInt(arguments[9]) ;;Argument 10 (OPTIONAL INOUT param10 I4) - arg10 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[10]) + arg10 = dispatcher.GetInt(arguments[10]) ;;Argument 11 (OPTIONAL INOUT param11 I1) - arg11 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[11]) + arg11 = dispatcher.GetInt(arguments[11]) ;;Argument 12 (OPTIONAL INOUT param12 I1) - arg12 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[12]) + arg12 = dispatcher.GetInt(arguments[12]) ;;Argument 13 (OPTIONAL INOUT param13 I2) - arg13 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[13]) + arg13 = dispatcher.GetInt(arguments[13]) ;;Argument 14 (OPTIONAL INOUT param14 I4) - arg14 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[14]) + arg14 = dispatcher.GetInt(arguments[14]) ;;Argument 15 (OPTIONAL INOUT param15 I4) - arg15 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[15]) + arg15 = dispatcher.GetInt(arguments[15]) ;;Argument 16 (OPTIONAL INOUT param16 I1) - arg16 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[16]) + arg16 = dispatcher.GetInt(arguments[16]) ;;Argument 17 (OPTIONAL INOUT param17 I1) - arg17 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[17]) + arg17 = dispatcher.GetInt(arguments[17]) ;;Argument 18 (OPTIONAL INOUT param18 I2) - arg18 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[18]) + arg18 = dispatcher.GetInt(arguments[18]) ;;Argument 19 (OPTIONAL INOUT param19 I4) - arg19 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[19]) + arg19 = dispatcher.GetInt(arguments[19]) ;;Argument 20 (OPTIONAL INOUT param20 I4) - arg20 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[20]) + arg20 = dispatcher.GetInt(arguments[20]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -1651,12 +1658,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL IN param1 D1) @@ -1695,49 +1702,49 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL IN param1 D1) - arg1 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetDecimal(arguments[1]) ;;Argument 2 (OPTIONAL IN param2 D3.3) - arg2 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetImplied(arguments[2]) ;;Argument 3 (OPTIONAL IN param3 D2.2) - arg3 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetImplied(arguments[3]) ;;Argument 4 (OPTIONAL IN param4 D3.2) - arg4 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[4]) + arg4 = dispatcher.GetImplied(arguments[4]) ;;Argument 5 (OPTIONAL IN param5 D3) - arg5 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[5]) + arg5 = dispatcher.GetDecimal(arguments[5]) ;;Argument 6 (OPTIONAL IN param6 D1) - arg6 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[6]) + arg6 = dispatcher.GetDecimal(arguments[6]) ;;Argument 7 (OPTIONAL IN param7 D3) - arg7 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[7]) + arg7 = dispatcher.GetDecimal(arguments[7]) ;;Argument 8 (OPTIONAL IN param8 D2) - arg8 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[8]) + arg8 = dispatcher.GetDecimal(arguments[8]) ;;Argument 9 (OPTIONAL IN param9 D2.2) - arg9 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[9]) + arg9 = dispatcher.GetImplied(arguments[9]) ;;Argument 10 (OPTIONAL IN param10 D1) - arg10 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[10]) + arg10 = dispatcher.GetDecimal(arguments[10]) ;;Argument 11 (OPTIONAL IN param11 D5.3) - arg11 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[11]) + arg11 = dispatcher.GetImplied(arguments[11]) ;;Argument 12 (OPTIONAL IN param12 D4.3) - arg12 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[12]) + arg12 = dispatcher.GetImplied(arguments[12]) ;;Argument 13 (OPTIONAL IN param13 D4.2) - arg13 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[13]) + arg13 = dispatcher.GetImplied(arguments[13]) ;;Argument 14 (OPTIONAL IN param14 D1) - arg14 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[14]) + arg14 = dispatcher.GetDecimal(arguments[14]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -1761,12 +1768,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL IN param1 A1) @@ -1801,43 +1808,43 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL IN param1 A1) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 2 (OPTIONAL IN param2 A5) - arg2 = dispatcher.GetText((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetText(arguments[2]) ;;Argument 3 (OPTIONAL IN param3 A6) - arg3 = dispatcher.GetText((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetText(arguments[3]) ;;Argument 4 (OPTIONAL IN param4 A2) - arg4 = dispatcher.GetText((@JsonObject)arguments.arrayValues[4]) + arg4 = dispatcher.GetText(arguments[4]) ;;Argument 5 (OPTIONAL IN param5 A1) - arg5 = dispatcher.GetText((@JsonObject)arguments.arrayValues[5]) + arg5 = dispatcher.GetText(arguments[5]) ;;Argument 6 (OPTIONAL IN param6 A5) - arg6 = dispatcher.GetText((@JsonObject)arguments.arrayValues[6]) + arg6 = dispatcher.GetText(arguments[6]) ;;Argument 7 (OPTIONAL IN param7 A12) - arg7 = dispatcher.GetText((@JsonObject)arguments.arrayValues[7]) + arg7 = dispatcher.GetText(arguments[7]) ;;Argument 8 (OPTIONAL IN param8 A1) - arg8 = dispatcher.GetText((@JsonObject)arguments.arrayValues[8]) + arg8 = dispatcher.GetText(arguments[8]) ;;Argument 9 (OPTIONAL IN param9 A1) - arg9 = dispatcher.GetText((@JsonObject)arguments.arrayValues[9]) + arg9 = dispatcher.GetText(arguments[9]) ;;Argument 10 (OPTIONAL IN param10 A6) - arg10 = dispatcher.GetText((@JsonObject)arguments.arrayValues[10]) + arg10 = dispatcher.GetText(arguments[10]) ;;Argument 11 (OPTIONAL IN param11 A18) - arg11 = dispatcher.GetText((@JsonObject)arguments.arrayValues[11]) + arg11 = dispatcher.GetText(arguments[11]) ;;Argument 12 (OPTIONAL IN param12 A4) - arg12 = dispatcher.GetText((@JsonObject)arguments.arrayValues[12]) + arg12 = dispatcher.GetText(arguments[12]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -1861,12 +1868,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL INOUT param1 A100) @@ -1879,10 +1886,10 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL INOUT param1 A100) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -1911,12 +1918,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL IN param1 I4) @@ -1930,10 +1937,10 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL IN param1 I4) - arg1 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetInt(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -1960,12 +1967,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL IN param1 I4 passed by VALUE) @@ -1979,10 +1986,10 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL IN param1 I4 passed by VALUE) - arg1 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetInt(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -2009,12 +2016,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL IN param1 D12.4) @@ -2057,55 +2064,55 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL IN param1 D12.4) - arg1 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetImplied(arguments[1]) ;;Argument 2 (OPTIONAL IN param2 D8.4) - arg2 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetImplied(arguments[2]) ;;Argument 3 (OPTIONAL IN param3 D4.4) - arg3 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetImplied(arguments[3]) ;;Argument 4 (OPTIONAL IN param4 D2.2) - arg4 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[4]) + arg4 = dispatcher.GetImplied(arguments[4]) ;;Argument 5 (OPTIONAL IN param5 D12.4) - arg5 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[5]) + arg5 = dispatcher.GetImplied(arguments[5]) ;;Argument 6 (OPTIONAL IN param6 D8.4) - arg6 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[6]) + arg6 = dispatcher.GetImplied(arguments[6]) ;;Argument 7 (OPTIONAL IN param7 D4.4) - arg7 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[7]) + arg7 = dispatcher.GetImplied(arguments[7]) ;;Argument 8 (OPTIONAL IN param8 D2.2) - arg8 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[8]) + arg8 = dispatcher.GetImplied(arguments[8]) ;;Argument 9 (OPTIONAL IN param9 D12.4) - arg9 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[9]) + arg9 = dispatcher.GetImplied(arguments[9]) ;;Argument 10 (OPTIONAL IN param10 D8.4) - arg10 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[10]) + arg10 = dispatcher.GetImplied(arguments[10]) ;;Argument 11 (OPTIONAL IN param11 D4.4) - arg11 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[11]) + arg11 = dispatcher.GetImplied(arguments[11]) ;;Argument 12 (OPTIONAL IN param12 D2.2) - arg12 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[12]) + arg12 = dispatcher.GetImplied(arguments[12]) ;;Argument 13 (OPTIONAL IN param13 D12.4) - arg13 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[13]) + arg13 = dispatcher.GetImplied(arguments[13]) ;;Argument 14 (OPTIONAL IN param14 D8.4) - arg14 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[14]) + arg14 = dispatcher.GetImplied(arguments[14]) ;;Argument 15 (OPTIONAL IN param15 D4.4) - arg15 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[15]) + arg15 = dispatcher.GetImplied(arguments[15]) ;;Argument 16 (OPTIONAL IN param16 D2.2) - arg16 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[16]) + arg16 = dispatcher.GetImplied(arguments[16]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -2129,12 +2136,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL IN param1 I4 passed by REFERENCE) @@ -2148,10 +2155,10 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL IN param1 I4 passed by REFERENCE) - arg1 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetInt(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -2178,12 +2185,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL IN p1 I4 passed by VALUE) @@ -2196,10 +2203,10 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL IN p1 I4 passed by VALUE) - arg1 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetInt(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -2223,12 +2230,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL INOUT p1 I4 passed by REFERENCE) @@ -2241,10 +2248,10 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL INOUT p1 I4 passed by REFERENCE) - arg1 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetInt(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -2273,12 +2280,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL INOUT p1 I4 passed by REFERENCE) @@ -2294,13 +2301,13 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL INOUT p1 I4 passed by REFERENCE) - arg1 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetInt(arguments[1]) ;;Argument 2 (OPTIONAL INOUT p2 D7.2 passed by REFERENCE) - arg2 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetImplied(arguments[2]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -2337,12 +2344,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL IN param1 A25) @@ -2377,43 +2384,43 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL IN param1 A25) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 2 (OPTIONAL IN p2 A5) - arg2 = dispatcher.GetText((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetText(arguments[2]) ;;Argument 3 (OPTIONAL IN param3 A6) - arg3 = dispatcher.GetText((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetText(arguments[3]) ;;Argument 4 (OPTIONAL IN param4 A2) - arg4 = dispatcher.GetText((@JsonObject)arguments.arrayValues[4]) + arg4 = dispatcher.GetText(arguments[4]) ;;Argument 5 (OPTIONAL IN param5 A24) - arg5 = dispatcher.GetText((@JsonObject)arguments.arrayValues[5]) + arg5 = dispatcher.GetText(arguments[5]) ;;Argument 6 (OPTIONAL IN param6 A5) - arg6 = dispatcher.GetText((@JsonObject)arguments.arrayValues[6]) + arg6 = dispatcher.GetText(arguments[6]) ;;Argument 7 (OPTIONAL IN param7 A12) - arg7 = dispatcher.GetText((@JsonObject)arguments.arrayValues[7]) + arg7 = dispatcher.GetText(arguments[7]) ;;Argument 8 (OPTIONAL IN x A4) - arg8 = dispatcher.GetText((@JsonObject)arguments.arrayValues[8]) + arg8 = dispatcher.GetText(arguments[8]) ;;Argument 9 (OPTIONAL IN param9 A25) - arg9 = dispatcher.GetText((@JsonObject)arguments.arrayValues[9]) + arg9 = dispatcher.GetText(arguments[9]) ;;Argument 10 (OPTIONAL IN param10 A6) - arg10 = dispatcher.GetText((@JsonObject)arguments.arrayValues[10]) + arg10 = dispatcher.GetText(arguments[10]) ;;Argument 11 (OPTIONAL IN param11 A18) - arg11 = dispatcher.GetText((@JsonObject)arguments.arrayValues[11]) + arg11 = dispatcher.GetText(arguments[11]) ;;Argument 12 (OPTIONAL IN param12 A4) - arg12 = dispatcher.GetText((@JsonObject)arguments.arrayValues[12]) + arg12 = dispatcher.GetText(arguments[12]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -2437,12 +2444,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL IN param1 A1) @@ -2477,43 +2484,43 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL IN param1 A1) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 2 (OPTIONAL IN param2 A5) - arg2 = dispatcher.GetText((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetText(arguments[2]) ;;Argument 3 (OPTIONAL IN param3 A6) - arg3 = dispatcher.GetText((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetText(arguments[3]) ;;Argument 4 (OPTIONAL IN param4 A2) - arg4 = dispatcher.GetText((@JsonObject)arguments.arrayValues[4]) + arg4 = dispatcher.GetText(arguments[4]) ;;Argument 5 (OPTIONAL IN param5 A1) - arg5 = dispatcher.GetText((@JsonObject)arguments.arrayValues[5]) + arg5 = dispatcher.GetText(arguments[5]) ;;Argument 6 (OPTIONAL IN param6 A5) - arg6 = dispatcher.GetText((@JsonObject)arguments.arrayValues[6]) + arg6 = dispatcher.GetText(arguments[6]) ;;Argument 7 (OPTIONAL IN param7 A12) - arg7 = dispatcher.GetText((@JsonObject)arguments.arrayValues[7]) + arg7 = dispatcher.GetText(arguments[7]) ;;Argument 8 (OPTIONAL IN param8 A4) - arg8 = dispatcher.GetText((@JsonObject)arguments.arrayValues[8]) + arg8 = dispatcher.GetText(arguments[8]) ;;Argument 9 (OPTIONAL IN param9 A1) - arg9 = dispatcher.GetText((@JsonObject)arguments.arrayValues[9]) + arg9 = dispatcher.GetText(arguments[9]) ;;Argument 10 (OPTIONAL IN param10 A6) - arg10 = dispatcher.GetText((@JsonObject)arguments.arrayValues[10]) + arg10 = dispatcher.GetText(arguments[10]) ;;Argument 11 (OPTIONAL IN param11 A18) - arg11 = dispatcher.GetText((@JsonObject)arguments.arrayValues[11]) + arg11 = dispatcher.GetText(arguments[11]) ;;Argument 12 (OPTIONAL IN param12 A4) - arg12 = dispatcher.GetText((@JsonObject)arguments.arrayValues[12]) + arg12 = dispatcher.GetText(arguments[12]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -2537,12 +2544,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL INOUT param1 A5) @@ -2562,19 +2569,19 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL INOUT param1 A5) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 2 (OPTIONAL INOUT param2 A30) - arg2 = dispatcher.GetText((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetText(arguments[2]) ;;Argument 3 (OPTIONAL INOUT param3 A8) - arg3 = dispatcher.GetText((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetText(arguments[3]) ;;Argument 4 (OPTIONAL IN param4 A1) - arg4 = dispatcher.GetText((@JsonObject)arguments.arrayValues[4]) + arg4 = dispatcher.GetText(arguments[4]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -2616,12 +2623,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL INOUT param1 A5) @@ -2637,13 +2644,13 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (OPTIONAL INOUT param1 A5) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 2 (OPTIONAL IN param2 A5) - arg2 = dispatcher.GetText((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetText(arguments[2]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -2675,12 +2682,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition endrecord @@ -2715,12 +2722,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition endrecord @@ -2755,12 +2762,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN name A20) @@ -2775,13 +2782,13 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN name A20) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 2 (REQUIRED INOUT message A30) - arg2 = dispatcher.GetText((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetText(arguments[2]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -2810,12 +2817,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition returnValue, i4 @@ -2854,12 +2861,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition endrecord @@ -2894,16 +2901,16 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT p1 [*]D5) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1Handle, D_HANDLE arg1HandlePos, int endrecord @@ -2919,12 +2926,12 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT p1 [*]D5) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 5) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") - arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 5) + arg1Array = arguments[1].GetProperty("PassedValue") + arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.GetArrayLength()) arg1HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg1Handle),argumentDefinition,arg1HandlePos,arg1Array) @@ -2955,16 +2962,16 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT p1 [*]D10.3) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1Handle, D_HANDLE arg1HandlePos, int endrecord @@ -2980,12 +2987,12 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT p1 [*]D10.3) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 10) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") - arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 10) + arg1Array = arguments[1].GetProperty("PassedValue") + arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.GetArrayLength()) arg1HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg1Handle),argumentDefinition,arg1HandlePos,arg1Array) @@ -3016,16 +3023,16 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT p1 [*]I4) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1Handle, D_HANDLE arg1HandlePos, int endrecord @@ -3041,12 +3048,12 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT p1 [*]I4) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 4) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") - arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 4) + arg1Array = arguments[1].GetProperty("PassedValue") + arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.GetArrayLength()) arg1HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg1Handle),argumentDefinition,arg1HandlePos,arg1Array) @@ -3077,16 +3084,16 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT p1 [*]A20) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1Handle, D_HANDLE arg1HandlePos, int endrecord @@ -3102,12 +3109,12 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT p1 [*]A20) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1], 20) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") - arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1], 20) + arg1Array = arguments[1].GetProperty("PassedValue") + arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.GetArrayLength()) arg1HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg1Handle),argumentDefinition,arg1HandlePos,arg1Array) @@ -3138,12 +3145,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN parm1 D5) @@ -3156,10 +3163,10 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN parm1 D5) - arg1 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetDecimal(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -3183,12 +3190,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT p1 A5) @@ -3245,76 +3252,76 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT p1 A5) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 2 (REQUIRED INOUT p2 A5) - arg2 = dispatcher.GetText((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetText(arguments[2]) ;;Argument 3 (REQUIRED INOUT p3 A5) - arg3 = dispatcher.GetText((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetText(arguments[3]) ;;Argument 4 (REQUIRED INOUT p4 A5) - arg4 = dispatcher.GetText((@JsonObject)arguments.arrayValues[4]) + arg4 = dispatcher.GetText(arguments[4]) ;;Argument 5 (REQUIRED INOUT p5 A5) - arg5 = dispatcher.GetText((@JsonObject)arguments.arrayValues[5]) + arg5 = dispatcher.GetText(arguments[5]) ;;Argument 6 (REQUIRED INOUT p6 A5) - arg6 = dispatcher.GetText((@JsonObject)arguments.arrayValues[6]) + arg6 = dispatcher.GetText(arguments[6]) ;;Argument 7 (REQUIRED INOUT p7 A5) - arg7 = dispatcher.GetText((@JsonObject)arguments.arrayValues[7]) + arg7 = dispatcher.GetText(arguments[7]) ;;Argument 8 (REQUIRED INOUT p8 A5) - arg8 = dispatcher.GetText((@JsonObject)arguments.arrayValues[8]) + arg8 = dispatcher.GetText(arguments[8]) ;;Argument 9 (REQUIRED INOUT p9 A5) - arg9 = dispatcher.GetText((@JsonObject)arguments.arrayValues[9]) + arg9 = dispatcher.GetText(arguments[9]) ;;Argument 10 (REQUIRED INOUT p10 A5) - arg10 = dispatcher.GetText((@JsonObject)arguments.arrayValues[10]) + arg10 = dispatcher.GetText(arguments[10]) ;;Argument 11 (REQUIRED INOUT p11 A5) - arg11 = dispatcher.GetText((@JsonObject)arguments.arrayValues[11]) + arg11 = dispatcher.GetText(arguments[11]) ;;Argument 12 (REQUIRED INOUT p12 A5) - arg12 = dispatcher.GetText((@JsonObject)arguments.arrayValues[12]) + arg12 = dispatcher.GetText(arguments[12]) ;;Argument 13 (REQUIRED INOUT p13 A5) - arg13 = dispatcher.GetText((@JsonObject)arguments.arrayValues[13]) + arg13 = dispatcher.GetText(arguments[13]) ;;Argument 14 (REQUIRED INOUT p14 A5) - arg14 = dispatcher.GetText((@JsonObject)arguments.arrayValues[14]) + arg14 = dispatcher.GetText(arguments[14]) ;;Argument 15 (REQUIRED INOUT p15 A5) - arg15 = dispatcher.GetText((@JsonObject)arguments.arrayValues[15]) + arg15 = dispatcher.GetText(arguments[15]) ;;Argument 16 (REQUIRED INOUT p16 A5) - arg16 = dispatcher.GetText((@JsonObject)arguments.arrayValues[16]) + arg16 = dispatcher.GetText(arguments[16]) ;;Argument 17 (REQUIRED INOUT p17 A5) - arg17 = dispatcher.GetText((@JsonObject)arguments.arrayValues[17]) + arg17 = dispatcher.GetText(arguments[17]) ;;Argument 18 (REQUIRED INOUT p18 A5) - arg18 = dispatcher.GetText((@JsonObject)arguments.arrayValues[18]) + arg18 = dispatcher.GetText(arguments[18]) ;;Argument 19 (REQUIRED INOUT p19 A5) - arg19 = dispatcher.GetText((@JsonObject)arguments.arrayValues[19]) + arg19 = dispatcher.GetText(arguments[19]) ;;Argument 20 (REQUIRED INOUT p20 A5) - arg20 = dispatcher.GetText((@JsonObject)arguments.arrayValues[20]) + arg20 = dispatcher.GetText(arguments[20]) ;;Argument 21 (REQUIRED INOUT p21 A5) - arg21 = dispatcher.GetText((@JsonObject)arguments.arrayValues[21]) + arg21 = dispatcher.GetText(arguments[21]) ;;Argument 22 (REQUIRED INOUT p22 A5) - arg22 = dispatcher.GetText((@JsonObject)arguments.arrayValues[22]) + arg22 = dispatcher.GetText(arguments[22]) ;;Argument 23 (REQUIRED INOUT p23 A5) - arg23 = dispatcher.GetText((@JsonObject)arguments.arrayValues[23]) + arg23 = dispatcher.GetText(arguments[23]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -3453,12 +3460,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT p1 A5) @@ -3515,76 +3522,76 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT p1 A5) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 2 (REQUIRED INOUT p2 A5) - arg2 = dispatcher.GetText((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetText(arguments[2]) ;;Argument 3 (REQUIRED INOUT p3 A5) - arg3 = dispatcher.GetText((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetText(arguments[3]) ;;Argument 4 (REQUIRED INOUT p4 A5) - arg4 = dispatcher.GetText((@JsonObject)arguments.arrayValues[4]) + arg4 = dispatcher.GetText(arguments[4]) ;;Argument 5 (REQUIRED INOUT p5 A5) - arg5 = dispatcher.GetText((@JsonObject)arguments.arrayValues[5]) + arg5 = dispatcher.GetText(arguments[5]) ;;Argument 6 (REQUIRED INOUT p6 A5) - arg6 = dispatcher.GetText((@JsonObject)arguments.arrayValues[6]) + arg6 = dispatcher.GetText(arguments[6]) ;;Argument 7 (REQUIRED INOUT p7 A5) - arg7 = dispatcher.GetText((@JsonObject)arguments.arrayValues[7]) + arg7 = dispatcher.GetText(arguments[7]) ;;Argument 8 (REQUIRED INOUT p8 A5) - arg8 = dispatcher.GetText((@JsonObject)arguments.arrayValues[8]) + arg8 = dispatcher.GetText(arguments[8]) ;;Argument 9 (REQUIRED INOUT p9 A5) - arg9 = dispatcher.GetText((@JsonObject)arguments.arrayValues[9]) + arg9 = dispatcher.GetText(arguments[9]) ;;Argument 10 (REQUIRED INOUT p10 A5) - arg10 = dispatcher.GetText((@JsonObject)arguments.arrayValues[10]) + arg10 = dispatcher.GetText(arguments[10]) ;;Argument 11 (REQUIRED INOUT p11 A5) - arg11 = dispatcher.GetText((@JsonObject)arguments.arrayValues[11]) + arg11 = dispatcher.GetText(arguments[11]) ;;Argument 12 (REQUIRED INOUT p12 A5) - arg12 = dispatcher.GetText((@JsonObject)arguments.arrayValues[12]) + arg12 = dispatcher.GetText(arguments[12]) ;;Argument 13 (REQUIRED INOUT p13 A5) - arg13 = dispatcher.GetText((@JsonObject)arguments.arrayValues[13]) + arg13 = dispatcher.GetText(arguments[13]) ;;Argument 14 (REQUIRED INOUT p14 A5) - arg14 = dispatcher.GetText((@JsonObject)arguments.arrayValues[14]) + arg14 = dispatcher.GetText(arguments[14]) ;;Argument 15 (REQUIRED INOUT p15 A5) - arg15 = dispatcher.GetText((@JsonObject)arguments.arrayValues[15]) + arg15 = dispatcher.GetText(arguments[15]) ;;Argument 16 (REQUIRED INOUT p16 A5) - arg16 = dispatcher.GetText((@JsonObject)arguments.arrayValues[16]) + arg16 = dispatcher.GetText(arguments[16]) ;;Argument 17 (REQUIRED INOUT p17 A5) - arg17 = dispatcher.GetText((@JsonObject)arguments.arrayValues[17]) + arg17 = dispatcher.GetText(arguments[17]) ;;Argument 18 (REQUIRED INOUT p18 A5) - arg18 = dispatcher.GetText((@JsonObject)arguments.arrayValues[18]) + arg18 = dispatcher.GetText(arguments[18]) ;;Argument 19 (REQUIRED INOUT p19 A5) - arg19 = dispatcher.GetText((@JsonObject)arguments.arrayValues[19]) + arg19 = dispatcher.GetText(arguments[19]) ;;Argument 20 (REQUIRED INOUT p20 A5) - arg20 = dispatcher.GetText((@JsonObject)arguments.arrayValues[20]) + arg20 = dispatcher.GetText(arguments[20]) ;;Argument 21 (REQUIRED INOUT p21 A5) - arg21 = dispatcher.GetText((@JsonObject)arguments.arrayValues[21]) + arg21 = dispatcher.GetText(arguments[21]) ;;Argument 22 (OPTIONAL INOUT p22 A5) - arg22 = dispatcher.GetText((@JsonObject)arguments.arrayValues[22]) + arg22 = dispatcher.GetText(arguments[22]) ;;Argument 23 (REQUIRED INOUT p23 A5) - arg23 = dispatcher.GetText((@JsonObject)arguments.arrayValues[23]) + arg23 = dispatcher.GetText(arguments[23]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -3723,12 +3730,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL OUT p1 I4) @@ -3774,12 +3781,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT outi8 I8) @@ -3825,12 +3832,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED INOUT p1 A5) @@ -3921,127 +3928,127 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED INOUT p1 A5) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 2 (REQUIRED IN p2 A5) - arg2 = dispatcher.GetText((@JsonObject)arguments.arrayValues[2]) + arg2 = dispatcher.GetText(arguments[2]) ;;Argument 3 (REQUIRED INOUT p3 A5) - arg3 = dispatcher.GetText((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetText(arguments[3]) ;;Argument 4 (REQUIRED IN p4 A5) - arg4 = dispatcher.GetText((@JsonObject)arguments.arrayValues[4]) + arg4 = dispatcher.GetText(arguments[4]) ;;Argument 5 (REQUIRED INOUT p5 A5) - arg5 = dispatcher.GetText((@JsonObject)arguments.arrayValues[5]) + arg5 = dispatcher.GetText(arguments[5]) ;;Argument 6 (REQUIRED IN p6 A5) - arg6 = dispatcher.GetText((@JsonObject)arguments.arrayValues[6]) + arg6 = dispatcher.GetText(arguments[6]) ;;Argument 7 (REQUIRED INOUT p7 A5) - arg7 = dispatcher.GetText((@JsonObject)arguments.arrayValues[7]) + arg7 = dispatcher.GetText(arguments[7]) ;;Argument 8 (REQUIRED IN p8 A5) - arg8 = dispatcher.GetText((@JsonObject)arguments.arrayValues[8]) + arg8 = dispatcher.GetText(arguments[8]) ;;Argument 9 (REQUIRED INOUT p9 A5) - arg9 = dispatcher.GetText((@JsonObject)arguments.arrayValues[9]) + arg9 = dispatcher.GetText(arguments[9]) ;;Argument 10 (REQUIRED IN p10 A5) - arg10 = dispatcher.GetText((@JsonObject)arguments.arrayValues[10]) + arg10 = dispatcher.GetText(arguments[10]) ;;Argument 11 (REQUIRED INOUT p11 D10) - arg11 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[11]) + arg11 = dispatcher.GetDecimal(arguments[11]) ;;Argument 12 (REQUIRED IN p12 D10) - arg12 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[12]) + arg12 = dispatcher.GetDecimal(arguments[12]) ;;Argument 13 (REQUIRED INOUT p13 D10) - arg13 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[13]) + arg13 = dispatcher.GetDecimal(arguments[13]) ;;Argument 14 (REQUIRED IN p14 D10) - arg14 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[14]) + arg14 = dispatcher.GetDecimal(arguments[14]) ;;Argument 15 (REQUIRED INOUT p15 D10) - arg15 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[15]) + arg15 = dispatcher.GetDecimal(arguments[15]) ;;Argument 16 (REQUIRED IN p16 D10) - arg16 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[16]) + arg16 = dispatcher.GetDecimal(arguments[16]) ;;Argument 17 (REQUIRED INOUT p17 D10) - arg17 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[17]) + arg17 = dispatcher.GetDecimal(arguments[17]) ;;Argument 18 (REQUIRED IN p18 D10) - arg18 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[18]) + arg18 = dispatcher.GetDecimal(arguments[18]) ;;Argument 19 (REQUIRED INOUT p19 D10) - arg19 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[19]) + arg19 = dispatcher.GetDecimal(arguments[19]) ;;Argument 20 (REQUIRED IN p20 D10) - arg20 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[20]) + arg20 = dispatcher.GetDecimal(arguments[20]) ;;Argument 21 (REQUIRED INOUT p21 D5.2) - arg21 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[21]) + arg21 = dispatcher.GetImplied(arguments[21]) ;;Argument 22 (REQUIRED IN p22 D5.2) - arg22 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[22]) + arg22 = dispatcher.GetImplied(arguments[22]) ;;Argument 23 (REQUIRED INOUT p23 D5.2) - arg23 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[23]) + arg23 = dispatcher.GetImplied(arguments[23]) ;;Argument 24 (REQUIRED IN p24 D5.2) - arg24 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[24]) + arg24 = dispatcher.GetImplied(arguments[24]) ;;Argument 25 (REQUIRED INOUT p25 D5.2) - arg25 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[25]) + arg25 = dispatcher.GetImplied(arguments[25]) ;;Argument 26 (REQUIRED IN p26 D5.2) - arg26 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[26]) + arg26 = dispatcher.GetImplied(arguments[26]) ;;Argument 27 (REQUIRED INOUT p27 D5.2) - arg27 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[27]) + arg27 = dispatcher.GetImplied(arguments[27]) ;;Argument 28 (REQUIRED IN p28 D5.2) - arg28 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[28]) + arg28 = dispatcher.GetImplied(arguments[28]) ;;Argument 29 (REQUIRED INOUT p29 D5.2) - arg29 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[29]) + arg29 = dispatcher.GetImplied(arguments[29]) ;;Argument 30 (REQUIRED IN p30 D5.2) - arg30 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[30]) + arg30 = dispatcher.GetImplied(arguments[30]) ;;Argument 31 (REQUIRED INOUT p31 I1) - arg31 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[31]) + arg31 = dispatcher.GetInt(arguments[31]) ;;Argument 32 (REQUIRED IN p32 I1) - arg32 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[32]) + arg32 = dispatcher.GetInt(arguments[32]) ;;Argument 33 (REQUIRED INOUT p33 I1) - arg33 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[33]) + arg33 = dispatcher.GetInt(arguments[33]) ;;Argument 34 (REQUIRED IN p34 I2) - arg34 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[34]) + arg34 = dispatcher.GetInt(arguments[34]) ;;Argument 35 (REQUIRED INOUT p35 I2) - arg35 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[35]) + arg35 = dispatcher.GetInt(arguments[35]) ;;Argument 36 (REQUIRED IN p36 I2) - arg36 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[36]) + arg36 = dispatcher.GetInt(arguments[36]) ;;Argument 37 (REQUIRED INOUT p37 I4) - arg37 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[37]) + arg37 = dispatcher.GetInt(arguments[37]) ;;Argument 38 (REQUIRED IN p38 I4) - arg38 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[38]) + arg38 = dispatcher.GetInt(arguments[38]) ;;Argument 39 (REQUIRED INOUT p39 I4) - arg39 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[39]) + arg39 = dispatcher.GetInt(arguments[39]) ;;Argument 40 (REQUIRED IN p40 I4) - arg40 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[40]) + arg40 = dispatcher.GetInt(arguments[40]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -4165,12 +4172,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN p1 A65535) @@ -4187,13 +4194,13 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN p1 A65535) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 3 (REQUIRED INOUT p3 A65535) - arg3 = dispatcher.GetText((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetText(arguments[3]) ;;------------------------------------------------------------ ;; Call the underlying routine @@ -4227,12 +4234,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition returnValue, A5 @@ -4271,12 +4278,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition returnValue, D3 @@ -4315,12 +4322,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition returnValue, I4 @@ -4359,12 +4366,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition returnValue, D3.1 @@ -4403,12 +4410,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition returnValue, i4 @@ -4447,12 +4454,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition returnValue, A40000 @@ -4491,12 +4498,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition returnValue, i4 @@ -4535,12 +4542,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (OPTIONAL OUT p1 A5) @@ -4603,12 +4610,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT message A30) @@ -4650,12 +4657,12 @@ namespace TraditionalBridge.Test.syntst protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN message A30) @@ -4668,10 +4675,10 @@ namespace TraditionalBridge.Test.syntst ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN message A30) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;------------------------------------------------------------ ;; Call the underlying routine diff --git a/TraditionalBridge.Test/SampleXfplEnvMethodDispachers.dbl b/TraditionalBridge.Test/SampleXfplEnvMethodDispachers.dbl index 2f744626..464c12b7 100644 --- a/TraditionalBridge.Test/SampleXfplEnvMethodDispachers.dbl +++ b/TraditionalBridge.Test/SampleXfplEnvMethodDispachers.dbl @@ -15,6 +15,13 @@ import Harmony.TraditionalBridge import System.Collections import TraditionalBridge.Test.Models +.ifdef DBLV11 +import System.Text.Json +.define JSON_ELEMENT @JsonElement +.else +.define JSON_ELEMENT @JsonValue +.endc + namespace TraditionalBridge.Test.SampleXfplEnv @@ -34,12 +41,12 @@ namespace TraditionalBridge.Test.SampleXfplEnv protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT Customers ArrayList collection of structure @Customer) @@ -92,12 +99,12 @@ namespace TraditionalBridge.Test.SampleXfplEnv protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT Customers [*]A162) @@ -132,7 +139,7 @@ namespace TraditionalBridge.Test.SampleXfplEnv ;;-------------------------------------------------------------------------------- ;;Argument 1 (REQUIRED OUT Customers [*]A162) - ;serializer.ArgumentHandleData(1, arg1Handle, FieldDataType.AlphaArrayField, 162, 0, arg1Array.arrayValues.Count, false) + ;serializer.ArgumentHandleData(1, arg1Handle, FieldDataType.AlphaArrayField, 162, 0, arg1Array.GetArrayLength(), false) ;;-------------------------------------------------------------------------------- ;;Argument 2 (REQUIRED OUT ErrorMessage A80) @@ -158,12 +165,12 @@ namespace TraditionalBridge.Test.SampleXfplEnv protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT Items ArrayList collection of structure @Item) @@ -218,12 +225,12 @@ namespace TraditionalBridge.Test.SampleXfplEnv protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT Orders ArrayList collection of structure @Order) @@ -278,12 +285,12 @@ namespace TraditionalBridge.Test.SampleXfplEnv protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED OUT Vendors ArrayList collection of structure @Vendor) @@ -338,12 +345,12 @@ namespace TraditionalBridge.Test.SampleXfplEnv protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN p1 A1) @@ -477,119 +484,119 @@ namespace TraditionalBridge.Test.SampleXfplEnv ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN p1 A1) - arg1 = dispatcher.GetText((@JsonObject)arguments.arrayValues[1]) + arg1 = dispatcher.GetText(arguments[1]) ;;Argument 3 (REQUIRED INOUT p3 A1) - arg3 = dispatcher.GetText((@JsonObject)arguments.arrayValues[3]) + arg3 = dispatcher.GetText(arguments[3]) ;;Argument 4 (REQUIRED IN p4 D6) - arg4 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[4]) + arg4 = dispatcher.GetDecimal(arguments[4]) ;;Argument 6 (REQUIRED INOUT p6 D6) - arg6 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[6]) + arg6 = dispatcher.GetDecimal(arguments[6]) ;;Argument 7 (REQUIRED IN p7 D12) - arg7 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[7]) + arg7 = dispatcher.GetDecimal(arguments[7]) ;;Argument 9 (REQUIRED INOUT p9 D12) - arg9 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[9]) + arg9 = dispatcher.GetDecimal(arguments[9]) ;;Argument 10 (REQUIRED IN p10 D6.2) - arg10 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[10]) + arg10 = dispatcher.GetImplied(arguments[10]) ;;Argument 12 (REQUIRED INOUT p12 D6.2) - arg12 = dispatcher.GetImplied((@JsonObject)arguments.arrayValues[12]) + arg12 = dispatcher.GetImplied(arguments[12]) ;;Argument 13 (REQUIRED IN p13 I1) - arg13 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[13]) + arg13 = dispatcher.GetInt(arguments[13]) ;;Argument 15 (REQUIRED INOUT p15 I1) - arg15 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[15]) + arg15 = dispatcher.GetInt(arguments[15]) ;;Argument 16 (REQUIRED IN p16 I2) - arg16 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[16]) + arg16 = dispatcher.GetInt(arguments[16]) ;;Argument 18 (REQUIRED INOUT p18 I2) - arg18 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[18]) + arg18 = dispatcher.GetInt(arguments[18]) ;;Argument 19 (REQUIRED IN p19 I4) - arg19 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[19]) + arg19 = dispatcher.GetInt(arguments[19]) ;;Argument 21 (REQUIRED INOUT p21 I4) - arg21 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[21]) + arg21 = dispatcher.GetInt(arguments[21]) ;;Argument 22 (REQUIRED IN p22 I8) - arg22 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[22]) + arg22 = dispatcher.GetInt(arguments[22]) ;;Argument 24 (REQUIRED INOUT p24 I8) - arg24 = dispatcher.GetInt((@JsonObject)arguments.arrayValues[24]) + arg24 = dispatcher.GetInt(arguments[24]) ;;Argument 25 (REQUIRED IN p25 structure @Customer) ;;Structure argument. Get the data object then get the record from it - arg25DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[3],mCustomerMetadata) + arg25DataObject = dispatcher.DeserializeObject(arguments[3],mCustomerMetadata) arg25 = arg25DataObject.SynergyRecord ;;Argument 27 (REQUIRED INOUT p27 structure @Customer) ;;Structure argument. Get the data object then get the record from it - arg27DataObject = dispatcher.DeserializeObject((@JsonObject)arguments.arrayValues[3],mCustomerMetadata) + arg27DataObject = dispatcher.DeserializeObject(arguments[3],mCustomerMetadata) arg27 = arg27DataObject.SynergyRecord ;;Argument 28 (REQUIRED IN p28 D8 YYYYMMDD date) - arg28 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[28]) + arg28 = dispatcher.GetDecimal(arguments[28]) ;;Argument 30 (REQUIRED INOUT p30 D8 YYYYMMDD date) - arg30 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[30]) + arg30 = dispatcher.GetDecimal(arguments[30]) ;;Argument 31 (REQUIRED IN p31 D6 YYMMDD date) - arg31 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[31]) + arg31 = dispatcher.GetDecimal(arguments[31]) ;;Argument 33 (REQUIRED INOUT p33 D6 YYMMDD date) - arg33 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[33]) + arg33 = dispatcher.GetDecimal(arguments[33]) ;;Argument 34 (REQUIRED IN p34 D7 YYYYJJJ date) - arg34 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[34]) + arg34 = dispatcher.GetDecimal(arguments[34]) ;;Argument 36 (REQUIRED INOUT p36 D7 YYYYJJJ date) - arg36 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[36]) + arg36 = dispatcher.GetDecimal(arguments[36]) ;;Argument 37 (REQUIRED IN p37 D5 YYJJJ date) - arg37 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[37]) + arg37 = dispatcher.GetDecimal(arguments[37]) ;;Argument 39 (REQUIRED INOUT p39 D5 YYJJJ date) - arg39 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[39]) + arg39 = dispatcher.GetDecimal(arguments[39]) ;;Argument 40 (REQUIRED IN p40 D6 HHMM time) - arg40 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[40]) + arg40 = dispatcher.GetDecimal(arguments[40]) ;;Argument 42 (REQUIRED INOUT p42 D6 HHMM time) - arg42 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[42]) + arg42 = dispatcher.GetDecimal(arguments[42]) ;;Argument 43 (REQUIRED IN p43 D4 HHMM time) - arg43 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[43]) + arg43 = dispatcher.GetDecimal(arguments[43]) ;;Argument 45 (REQUIRED INOUT p45 D4 HHMM time) - arg45 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[45]) + arg45 = dispatcher.GetDecimal(arguments[45]) ;;Argument 46 (REQUIRED IN p46 D14 YYYYMMDD date) - arg46 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[46]) + arg46 = dispatcher.GetDecimal(arguments[46]) ;;Argument 48 (REQUIRED INOUT p48 D14 HHMM time) - arg48 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[48]) + arg48 = dispatcher.GetDecimal(arguments[48]) ;;Argument 49 (REQUIRED IN p49 D20 YYYYMMDD date) - arg49 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[49]) + arg49 = dispatcher.GetDecimal(arguments[49]) ;;Argument 51 (REQUIRED INOUT p51 D20 YYYYMMDD date) - arg51 = dispatcher.GetDecimal((@JsonObject)arguments.arrayValues[51]) + arg51 = dispatcher.GetDecimal(arguments[51]) ;;Argument 52 (REQUIRED IN p52 enum METHOD_STATUS) - arg52 = (METHOD_STATUS)dispatcher.GetInt((@JsonObject)arguments.arrayValues[52]) + arg52 = (METHOD_STATUS)dispatcher.GetInt(arguments[52]) ;;Argument 54 (REQUIRED INOUT p54 enum METHOD_STATUS) - arg54 = (METHOD_STATUS)dispatcher.GetInt((@JsonObject)arguments.arrayValues[54]) + arg54 = (METHOD_STATUS)dispatcher.GetInt(arguments[54]) ;;Argument 55 (REQUIRED IN p55 D_HANDLE) ;TODO: Template needs code for HANDLE arguments! @@ -905,34 +912,34 @@ namespace TraditionalBridge.Test.SampleXfplEnv protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN p1 [*]A1) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1Handle, D_HANDLE arg1HandlePos, int ;;Argument 2 (REQUIRED OUT p2 [*]A1) arg2Handle, D_HANDLE arg2HandlePos, int ;;Argument 3 (REQUIRED INOUT p3 [*]A1) - arg3Array, @JsonArray + arg3Array, JSON_ELEMENT arg3Handle, D_HANDLE arg3HandlePos, int ;;Argument 4 (REQUIRED IN p25 [*]structure @Customer) - arg4Array, @JsonArray + arg4Array, JSON_ELEMENT arg4Handle, D_HANDLE arg4HandlePos, int ;;Argument 5 (REQUIRED OUT p26 [*]structure @Customer) arg5Handle, D_HANDLE arg5HandlePos, int ;;Argument 6 (REQUIRED INOUT p27 [*]structure @Customer) - arg6Array, @JsonArray + arg6Array, JSON_ELEMENT arg6Handle, D_HANDLE arg6HandlePos, int endrecord @@ -973,33 +980,33 @@ namespace TraditionalBridge.Test.SampleXfplEnv ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN p1 [*]A1) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1]) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") - arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1]) + arg1Array = (arguments[1]).GetProperty("PassedValue") + arg1Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg1Array.GetArrayLength()) arg1HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg1Handle),argumentDefinition,arg1HandlePos,arg1Array) ;;Argument 3 (REQUIRED INOUT p3 [*]A1) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[3]) - arg3Array = (@JsonArray)((@JsonObject)arguments.arrayValues[3]).GetProperty("PassedValue") - arg3Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg3Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[3]) + arg3Array = (arguments[3]).GetProperty("PassedValue") + arg3Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg3Array.GetArrayLength()) arg3HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg3Handle),argumentDefinition,arg3HandlePos,arg3Array) ;;Argument 4 (REQUIRED IN p25 [*]structure @Customer) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[4]) - arg4Array = (@JsonArray)((@JsonObject)arguments.arrayValues[4]).GetProperty("PassedValue") - arg4Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg4Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[4]) + arg4Array = (arguments[4]).GetProperty("PassedValue") + arg4Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg4Array.GetArrayLength()) arg4HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg4Handle),argumentDefinition,arg4HandlePos,arg4Array) ;;Argument 6 (REQUIRED INOUT p27 [*]structure @Customer) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[6]) - arg6Array = (@JsonArray)((@JsonObject)arguments.arrayValues[6]).GetProperty("PassedValue") - arg6Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg6Array.arrayValues.Count) + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[6]) + arg6Array = (arguments[6]).GetProperty("PassedValue") + arg6Handle = %mem_proc(DM_ALLOC,argumentDefinition.ElementSize*arg6Array.GetArrayLength()) arg6HandlePos = 1 dispatcher.UnwrapObjectCollection(^m(arg6Handle),argumentDefinition,arg6HandlePos,arg6Array) @@ -1011,22 +1018,22 @@ namespace TraditionalBridge.Test.SampleXfplEnv ;;-------------------------------------------------------------------------------- ;;Argument 2 (REQUIRED OUT p2 [*]A1) - ;serializer.ArgumentHandleData(2, arg2Handle, FieldDataType.AlphaArrayField, 1, 0, arg2Array.arrayValues.Count, false) + ;serializer.ArgumentHandleData(2, arg2Handle, FieldDataType.AlphaArrayField, 1, 0, arg2Array.GetArrayLength(), false) ;;-------------------------------------------------------------------------------- ;;Argument 3 (REQUIRED INOUT p3 [*]A1) - serializer.ArgumentHandleData(3, arg3Handle, FieldDataType.AlphaArrayField, 1, 0, arg3Array.arrayValues.Count, false) + serializer.ArgumentHandleData(3, arg3Handle, FieldDataType.AlphaArrayField, 1, 0, arg3Array.GetArrayLength(), false) ;;-------------------------------------------------------------------------------- ;;Argument 5 (REQUIRED OUT p26 [*]structure @Customer) - ;serializer.ArgumentHandleData(5, arg5Handle, FieldDataType.DataObjectCollectionField, 161, "CUSTOMERS", arg5Array.arrayValues.Count, false) + ;serializer.ArgumentHandleData(5, arg5Handle, FieldDataType.DataObjectCollectionField, 161, "CUSTOMERS", arg5Array.GetArrayLength(), false) ;;-------------------------------------------------------------------------------- ;;Argument 6 (REQUIRED INOUT p27 [*]structure @Customer) - serializer.ArgumentHandleData(6, arg6Handle, FieldDataType.DataObjectCollectionField, 161, "CUSTOMERS", arg6Array.arrayValues.Count, false) + serializer.ArgumentHandleData(6, arg6Handle, FieldDataType.DataObjectCollectionField, 161, "CUSTOMERS", arg6Array.GetArrayLength(), false) endmethod endclass @@ -1047,96 +1054,96 @@ namespace TraditionalBridge.Test.SampleXfplEnv protected override method DispatchInternal, void required in name, string - required in callFrame, @JsonObject + required in callFrame, JSON_ELEMENT required in serializer, @DispatchSerializer required in dispatcher, @RoutineDispatcher record requestId, int - arguments, @JsonArray + arguments, JSON_ELEMENT argumentDefinition, @ArgumentDataDefinition ;;Argument 1 (REQUIRED IN p1 ArrayList collection of A1) - arg1Array, @JsonArray + arg1Array, JSON_ELEMENT arg1, @ArrayList ;;Argument 2 (REQUIRED OUT p2 ArrayList collection of A1) arg2, @ArrayList ;;Argument 3 (REQUIRED IN p4 ArrayList collection of D6) - arg3Array, @JsonArray + arg3Array, JSON_ELEMENT arg3, @ArrayList ;;Argument 4 (REQUIRED OUT p5 ArrayList collection of D6) arg4, @ArrayList ;;Argument 5 (REQUIRED IN p7 ArrayList collection of D12) - arg5Array, @JsonArray + arg5Array, JSON_ELEMENT arg5, @ArrayList ;;Argument 6 (REQUIRED OUT p8 ArrayList collection of D12) arg6, @ArrayList ;;Argument 7 (REQUIRED IN p10 ArrayList collection of D6.2) - arg7Array, @JsonArray + arg7Array, JSON_ELEMENT arg7, @ArrayList ;;Argument 8 (REQUIRED OUT p11 ArrayList collection of D6.2) arg8, @ArrayList ;;Argument 9 (REQUIRED IN p13 ArrayList collection of I1) - arg9Array, @JsonArray + arg9Array, JSON_ELEMENT arg9, @ArrayList ;;Argument 10 (REQUIRED OUT p14 ArrayList collection of I1) arg10, @ArrayList ;;Argument 11 (REQUIRED IN p16 ArrayList collection of I2) - arg11Array, @JsonArray + arg11Array, JSON_ELEMENT arg11, @ArrayList ;;Argument 12 (REQUIRED OUT p17 ArrayList collection of I2) arg12, @ArrayList ;;Argument 13 (REQUIRED IN p19 ArrayList collection of I4) - arg13Array, @JsonArray + arg13Array, JSON_ELEMENT arg13, @ArrayList ;;Argument 14 (REQUIRED OUT p20 ArrayList collection of I4) arg14, @ArrayList ;;Argument 15 (REQUIRED IN p22 ArrayList collection of I8) - arg15Array, @JsonArray + arg15Array, JSON_ELEMENT arg15, @ArrayList ;;Argument 16 (REQUIRED OUT p23 ArrayList collection of I8) arg16, @ArrayList ;;Argument 17 (REQUIRED IN p25 ArrayList collection of structure @Customer) - arg17Array, @JsonArray + arg17Array, JSON_ELEMENT arg17, @ArrayList ;;Argument 18 (REQUIRED OUT p26 ArrayList collection of structure @Customer) arg18, @ArrayList ;;Argument 19 (REQUIRED IN p28 ArrayList collection of D8 YYYYMMDD date) - arg19Array, @JsonArray + arg19Array, JSON_ELEMENT arg19, @ArrayList ;;Argument 20 (REQUIRED OUT p29 ArrayList collection of D8 YYYYMMDD date) arg20, @ArrayList ;;Argument 21 (REQUIRED IN p31 ArrayList collection of D6 YYMMDD date) - arg21Array, @JsonArray + arg21Array, JSON_ELEMENT arg21, @ArrayList ;;Argument 22 (REQUIRED OUT p32 ArrayList collection of D6 YYMMDD date) arg22, @ArrayList ;;Argument 23 (REQUIRED IN p34 ArrayList collection of D7 YYYYJJJ date) - arg23Array, @JsonArray + arg23Array, JSON_ELEMENT arg23, @ArrayList ;;Argument 24 (REQUIRED OUT p35 ArrayList collection of D7 YYYYJJJ date) arg24, @ArrayList ;;Argument 25 (REQUIRED IN p37 ArrayList collection of D5 YYJJJ date) - arg25Array, @JsonArray + arg25Array, JSON_ELEMENT arg25, @ArrayList ;;Argument 26 (REQUIRED OUT p38 ArrayList collection of D5 YYJJJ date) arg26, @ArrayList ;;Argument 27 (REQUIRED IN p40 ArrayList collection of D6 HHMM time) - arg27Array, @JsonArray + arg27Array, JSON_ELEMENT arg27, @ArrayList ;;Argument 28 (REQUIRED OUT p41 ArrayList collection of D6 HHMM time) arg28, @ArrayList ;;Argument 29 (REQUIRED IN p43 ArrayList collection of D4 HHMM time) - arg29Array, @JsonArray + arg29Array, JSON_ELEMENT arg29, @ArrayList ;;Argument 30 (REQUIRED OUT p44 ArrayList collection of D4 HHMM time) arg30, @ArrayList ;;Argument 31 (REQUIRED IN p46 ArrayList collection of D14 YYYYMMDD date) - arg31Array, @JsonArray + arg31Array, JSON_ELEMENT arg31, @ArrayList ;;Argument 32 (REQUIRED OUT p47 ArrayList collection of D14 YYYYMMDD date) arg32, @ArrayList ;;Argument 33 (REQUIRED IN p49 ArrayList collection of D20 YYYYMMDD date) - arg33Array, @JsonArray + arg33Array, JSON_ELEMENT arg33, @ArrayList ;;Argument 34 (REQUIRED OUT p50 ArrayList collection of D20 YYYYMMDD date) arg34, @ArrayList @@ -1148,107 +1155,107 @@ namespace TraditionalBridge.Test.SampleXfplEnv ;;------------------------------------------------------------ ;;Process inbound arguments - arguments = (@JsonArray)callFrame.GetProperty("params") + arguments = callFrame.GetProperty("params") ;;Argument 1 (REQUIRED IN p1 ArrayList collection of A1) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[1]) - arg1Array = (@JsonArray)((@JsonObject)arguments.arrayValues[1]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[1]) + arg1Array = (arguments[1]).GetProperty("PassedValue") arg1 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg1Array,arg1) ;;Argument 3 (REQUIRED IN p4 ArrayList collection of D6) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[3]) - arg3Array = (@JsonArray)((@JsonObject)arguments.arrayValues[3]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[3]) + arg3Array = (arguments[3]).GetProperty("PassedValue") arg3 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg3Array,arg3) ;;Argument 5 (REQUIRED IN p7 ArrayList collection of D12) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[5]) - arg5Array = (@JsonArray)((@JsonObject)arguments.arrayValues[5]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[5]) + arg5Array = (arguments[5]).GetProperty("PassedValue") arg5 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg5Array,arg5) ;;Argument 7 (REQUIRED IN p10 ArrayList collection of D6.2) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[7]) - arg7Array = (@JsonArray)((@JsonObject)arguments.arrayValues[7]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[7]) + arg7Array = (arguments[7]).GetProperty("PassedValue") arg7 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg7Array,arg7) ;;Argument 9 (REQUIRED IN p13 ArrayList collection of I1) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[9]) - arg9Array = (@JsonArray)((@JsonObject)arguments.arrayValues[9]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[9]) + arg9Array = (arguments[9]).GetProperty("PassedValue") arg9 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg9Array,arg9) ;;Argument 11 (REQUIRED IN p16 ArrayList collection of I2) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[11]) - arg11Array = (@JsonArray)((@JsonObject)arguments.arrayValues[11]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[11]) + arg11Array = (arguments[11]).GetProperty("PassedValue") arg11 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg11Array,arg11) ;;Argument 13 (REQUIRED IN p19 ArrayList collection of I4) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[13]) - arg13Array = (@JsonArray)((@JsonObject)arguments.arrayValues[13]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[13]) + arg13Array = (arguments[13]).GetProperty("PassedValue") arg13 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg13Array,arg13) ;;Argument 15 (REQUIRED IN p22 ArrayList collection of I8) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[15]) - arg15Array = (@JsonArray)((@JsonObject)arguments.arrayValues[15]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[15]) + arg15Array = (arguments[15]).GetProperty("PassedValue") arg15 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg15Array,arg15) ;;Argument 17 (REQUIRED IN p25 ArrayList collection of structure @Customer) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[17]) - arg17Array = (@JsonArray)((@JsonObject)arguments.arrayValues[17]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[17]) + arg17Array = (arguments[17]).GetProperty("PassedValue") arg17 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg17Array,arg17) ;;Argument 19 (REQUIRED IN p28 ArrayList collection of D8 YYYYMMDD date) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[19]) - arg19Array = (@JsonArray)((@JsonObject)arguments.arrayValues[19]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[19]) + arg19Array = (arguments[19]).GetProperty("PassedValue") arg19 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg19Array,arg19) ;;Argument 21 (REQUIRED IN p31 ArrayList collection of D6 YYMMDD date) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[21]) - arg21Array = (@JsonArray)((@JsonObject)arguments.arrayValues[21]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[21]) + arg21Array = (arguments[21]).GetProperty("PassedValue") arg21 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg21Array,arg21) ;;Argument 23 (REQUIRED IN p34 ArrayList collection of D7 YYYYJJJ date) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[23]) - arg23Array = (@JsonArray)((@JsonObject)arguments.arrayValues[23]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[23]) + arg23Array = (arguments[23]).GetProperty("PassedValue") arg23 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg23Array,arg23) ;;Argument 25 (REQUIRED IN p37 ArrayList collection of D5 YYJJJ date) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[25]) - arg25Array = (@JsonArray)((@JsonObject)arguments.arrayValues[25]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[25]) + arg25Array = (arguments[25]).GetProperty("PassedValue") arg25 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg25Array,arg25) ;;Argument 27 (REQUIRED IN p40 ArrayList collection of D6 HHMM time) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[27]) - arg27Array = (@JsonArray)((@JsonObject)arguments.arrayValues[27]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[27]) + arg27Array = (arguments[27]).GetProperty("PassedValue") arg27 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg27Array,arg27) ;;Argument 29 (REQUIRED IN p43 ArrayList collection of D4 HHMM time) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[29]) - arg29Array = (@JsonArray)((@JsonObject)arguments.arrayValues[29]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[29]) + arg29Array = (arguments[29]).GetProperty("PassedValue") arg29 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg29Array,arg29) ;;Argument 31 (REQUIRED IN p46 ArrayList collection of D14 YYYYMMDD date) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[31]) - arg31Array = (@JsonArray)((@JsonObject)arguments.arrayValues[31]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[31]) + arg31Array = (arguments[31]).GetProperty("PassedValue") arg31 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg31Array,arg31) ;;Argument 33 (REQUIRED IN p49 ArrayList collection of D20 YYYYMMDD date) - argumentDefinition = dispatcher.GetArgumentDataDefForCollection((@JsonObject)arguments.arrayValues[33]) - arg33Array = (@JsonArray)((@JsonObject)arguments.arrayValues[33]).GetProperty("PassedValue") + argumentDefinition = dispatcher.GetArgumentDataDefForCollection(arguments[33]) + arg33Array = (arguments[33]).GetProperty("PassedValue") arg33 = new ArrayList() dispatcher.UnwrapObjectCollection(argumentDefinition,arg33Array,arg33) diff --git a/TraditionalBridge.Test/TraditionalBridge.Test.synproj b/TraditionalBridge.Test/TraditionalBridge.Test.synproj index f63d6559..a4a25b86 100644 --- a/TraditionalBridge.Test/TraditionalBridge.Test.synproj +++ b/TraditionalBridge.Test/TraditionalBridge.Test.synproj @@ -33,6 +33,7 @@ x64 false Debug + 11010100 true @@ -46,9 +47,10 @@ False $(SolutionDir)\$(Configuration)\$(Platform) TESTDIR: - x86 + x64 false Optimize + 11010100 true diff --git a/TraditionalBridge/DataObjectMetadataBase.dbl b/TraditionalBridge/DataObjectMetadataBase.dbl index a0fbe4f0..0a00f140 100644 --- a/TraditionalBridge/DataObjectMetadataBase.dbl +++ b/TraditionalBridge/DataObjectMetadataBase.dbl @@ -143,7 +143,6 @@ namespace Harmony.TraditionalBridge public method Deserialize, @DataObjectBase passedValue, @Json.JsonObject record - passedValue, @Json.JsonObject objectMetadata, @DataObjectMetadataBase objectType, @Json.JsonText objectValue, @Json.JsonText @@ -164,8 +163,26 @@ namespace Harmony.TraditionalBridge objectGRFA = (@Json.JsonText)passedValue.GetProperty("GRFA") mreturn MakeNew(stringValue, Convert.FromBase64String(objectGRFA.Value)) - endmethod + endmethod +.ifdef DBLV11 + public method Deserialize, @DataObjectBase + passedValue, @System.Text.Json.JsonElement + record + stringValue, @string + proc + if(RPSStructureHasBinaryData) then + begin + stringValue = passedValue.GetProperty("Base64Value").GetStringFromBase64() + end + else + begin + stringValue = passedValue.GetProperty("Value").GetString() + end + mreturn MakeNew(stringValue, passedValue.GetProperty("GRFA").GetStringFromBase64()) + + endmethod +.endc endclass endnamespace diff --git a/TraditionalBridge/Json.dbl b/TraditionalBridge/Json.dbl index 9be4f2c0..9448516f 100644 --- a/TraditionalBridge/Json.dbl +++ b/TraditionalBridge/Json.dbl @@ -1,4 +1,5 @@ import System.Collections +import Harmony.TraditionalBridge .ifdef DBLNET .define STRING_AT(inputValue, index) inputValue[index] @@ -789,7 +790,145 @@ namespace Json endclass class JsonValue - public JsonType, JSON_TYPE + public JsonType, JSON_TYPE + + public method GetProperty, @JsonValue + propertyName, @string + proc + if(JsonType == JSON_TYPE.OBJ) then + begin + mreturn ((@JsonObject)this).GetProperty(propertyName) + end + else + throw new InvalidOperationException() + endmethod + + public method TryGetProperty, boolean + propertyName, @string + out value, @JsonValue + proc + if(JsonType == JSON_TYPE.OBJ) then + begin + mreturn ((@JsonObject)this).TryGetProperty(propertyName, value) + end + else + throw new InvalidOperationException() + endmethod + + public property ValueKind, JSON_TYPE + method get + proc + mreturn JsonType + endmethod + endproperty + + + public method GetArrayLength, int + proc + if(JsonType == JSON_TYPE.ARRAY_VAL) then + begin + mreturn ((@JsonArray)this).arrayValues.Count + end + else + throw new InvalidOperationException() + endmethod + + public property Indexer, @JsonValue + in index, int + method get + proc + if(JsonType == JSON_TYPE.ARRAY_VAL) then + begin + mreturn (@JsonValue)((@JsonArray)this).arrayValues[index] + end + else + throw new InvalidOperationException() + end + endproperty + + public method GetBoolean, boolean + proc + if(JsonType == JSON_TYPE.BOOL) then + begin + mreturn ((@JsonBoolean)this).Value + end + else + throw new InvalidOperationException() + endmethod + + public method GetByte, i1 + proc + if(JsonType == JSON_TYPE.NUMBER) then + begin + mreturn ((@JsonNumber)this).Value + end + else + throw new InvalidOperationException() + endmethod + + public method GetStringFromBase64, @string + proc + if(JsonType == JSON_TYPE.TEXT) then + begin + mreturn Convert.FromBase64String(((@JsonText)this).Value) + end + else + throw new InvalidOperationException() + endmethod + + public method GetDecimal, decimal + proc + if(JsonType == JSON_TYPE.NUMBER) then + begin + mreturn ((@JsonNumber)this).Value + end + else if(JsonType == JSON_TYPE.INT_VAL) then + begin + mreturn ((@JsonInt)this).Value + end + else + throw new InvalidOperationException() + endmethod + + public method GetInt16, short + proc + if(JsonType == JSON_TYPE.INT_VAL) then + begin + mreturn ((@JsonInt)this).Value + end + else + throw new InvalidOperationException() + endmethod + + public method GetInt32, int + proc + if(JsonType == JSON_TYPE.INT_VAL) then + begin + mreturn ((@JsonInt)this).Value + end + else + throw new InvalidOperationException() + endmethod + + public method GetInt64, i8 + proc + if(JsonType == JSON_TYPE.INT_VAL) then + begin + mreturn ((@JsonInt)this).Value + end + else + throw new InvalidOperationException() + endmethod + + public method GetString, @string + proc + if(JsonType == JSON_TYPE.TEXT) then + begin + mreturn ((@JsonText)this).Value + end + else + throw new InvalidOperationException() + endmethod endclass class jsonNull extends JsonValue diff --git a/TraditionalBridge/RoutineDispatcher.dbl b/TraditionalBridge/RoutineDispatcher.dbl index 537d036e..a0f6b61e 100644 --- a/TraditionalBridge/RoutineDispatcher.dbl +++ b/TraditionalBridge/RoutineDispatcher.dbl @@ -1,7 +1,23 @@ - -import Json import System.Collections import TraditionalBridge +import Json + +.ifdef DBLV11 +import System.Text.Json +.define JSON_ELEMENT @JsonElement +.define IS_OBJ(element) ((element).ValueKind == JsonValueKind.Object) +.define IS_NUMBER(element) ((element).ValueKind == JsonValueKind.Number) +.define IS_TEXT(element) ((element).ValueKind == JsonValueKind.String) +.define IS_ARRAY(element) ((element).ValueKind == JsonValueKind.Array) +.define IS_BOOLEAN(element) ((element).ValueKind == JsonValueKind.True || (element).ValueKind == JsonValueKind.False) +.else +.define JSON_ELEMENT @JsonValue +.define IS_OBJ(element) ((element).JsonType == JSON_TYPE.OBJ) +.define IS_NUMBER(element) ((element).JsonType == JSON_TYPE.NUMBER || (element).JsonType == JSON_TYPE.INT_VAL) +.define IS_TEXT(element) ((element).JsonType == JSON_TYPE.TEXT) +.define IS_ARRAY(element) ((element).JsonType == JSON_TYPE.ARRAY_VAL) +.define IS_BOOLEAN(element) ((element).JsonType == JSON_TYPE.BOOL) +.endc .define MaybeLog(priority, msg) if((priority) <= Logger.LogLevel) Logger.Instance.Log(msg) ;.define MaybeLog(priority, msg) Logger.Instance.Log(msg) @@ -51,20 +67,20 @@ namespace Harmony.TraditionalBridge ;;; Instance of a data object metadata class indicating the type to deserialize to ;;; A data object of the appropriate type public virtual method DeserializeObject, @DataObjectBase - obj, @JsonObject + obj, JSON_ELEMENT targetType, @DataObjectMetadataBase record - passedValue, @JsonObject + passedValue, JSON_ELEMENT objectMetadata, @DataObjectMetadataBase - objectType, @JsonText + objectType, @string endrecord proc - passedValue = (@JsonObject)obj.GetProperty("PassedValue") + passedValue = obj.GetProperty("PassedValue") objectMetadata = targetType if(objectMetadata == ^null) begin - objectType = (@JsonText)passedValue.GetProperty("Type") - objectMetadata = DataObjectMetadataBase.LookupType(objectType.Value) + objectType = passedValue.GetProperty("Type").GetString() + objectMetadata = DataObjectMetadataBase.LookupType(objectType) end mreturn objectMetadata.Deserialize(passedValue) endmethod @@ -79,53 +95,57 @@ namespace Harmony.TraditionalBridge ;;; JSON object to deserialize ;;; ArrayList containing data objects. public virtual method DeserializeObjectCollection, @ArrayList - obj, @JsonObject + obj, JSON_ELEMENT record - passedValue, @JsonArray - elementValue, @JsonValue - elementObject, @JsonObject + passedValue, JSON_ELEMENT + elementValue, JSON_ELEMENT + elementObject, JSON_ELEMENT objectMetadata, @DataObjectMetadataBase - objectType, @JsonText + objectType, @string result, @ArrayList + elementIsEncodedProp, JSON_ELEMENT elementIsEncoded, boolean - elementTypeValue, @JsonValue + elementTypeValue, JSON_ELEMENT isBriefEncoding, boolean + i, int + collectionSize, int endrecord proc isBriefEncoding = false + elementIsEncoded = false result = new ArrayList() - passedValue = (@JsonArray)obj.GetProperty("PassedValue") + passedValue = obj.GetProperty("PassedValue") + + if(obj.TryGetProperty("ElementIsEncoded", elementIsEncodedProp)) + elementIsEncoded = elementIsEncodedProp.GetBoolean() - obj.TryGetBoolProperty("ElementIsEncoded", elementIsEncoded) if(obj.TryGetProperty("ElementType", elementTypeValue)) begin isBriefEncoding = true - objectMetadata = DataObjectMetadataBase.LookupType(((@JsonText)elementTypeValue).Value) + objectMetadata = DataObjectMetadataBase.LookupType(elementTypeValue.GetString()) end - - foreach elementValue in passedValue.arrayValues + collectionSize = passedValue.GetArrayLength() + for i from 0 thru collectionSize - 1 by 1 begin + elementValue = passedValue[i] + ;;TODO might be able to skip the lookup if the typename hasnt changed if(!isBriefEncoding) then begin - if(elementValue .is. @JsonObject) then + if(IS_OBJ(elementValue)) then begin - elementObject = (@JsonObject)elementValue - objectType = (@JsonText)elementObject.GetProperty("Type") - objectMetadata = DataObjectMetadataBase.LookupType(objectType.Value) + elementObject = elementValue + objectType = elementObject.GetProperty("Type").GetString() + objectMetadata = DataObjectMetadataBase.LookupType(objectType) result.Add(objectMetadata.Deserialize(elementObject)) end - else if(elementValue .is. @JsonText) then - begin - result.Add(((@JsonText)elementValue).Value) - end - else if(elementValue .is. @JsonInt) then + else if(IS_TEXT(elementValue)) then begin - result.Add((@i)((@JsonInt)elementValue).Value) + result.Add(elementValue.GetString()) end - else if(elementValue .is. @JsonNumber) then + else if(IS_NUMBER(elementValue)) then begin - result.Add((@id)((@JsonNumber)elementValue).Value) + result.Add((@*)elementValue.GetDecimal()) end ;else if(elementValue .is. @JsonBoolean) then ; begin @@ -136,11 +156,11 @@ namespace Harmony.TraditionalBridge end else if(elementIsEncoded) then begin - result.Add(objectMetadata.MakeNew(Convert.FromBase64String(((@JsonText)elementValue).Value), "")) + result.Add(objectMetadata.MakeNew(elementValue.GetStringFromBase64(), "")) end else begin - result.Add(objectMetadata.MakeNew(((@JsonText)elementValue).Value, "")) + result.Add(objectMetadata.MakeNew(elementValue.GetString(), "")) end end mreturn result @@ -160,7 +180,7 @@ namespace Harmony.TraditionalBridge public method UnwrapObjectCollection, void dataDef, @ArgumentDataDefinition - jsonArray, @JsonArray + jsonArray, JSON_ELEMENT arrayList, @ArrayList proc @@ -179,47 +199,47 @@ namespace Harmony.TraditionalBridge inout buffer, a elementInfo, @ArgumentDataDefinition inout bufferPosition, i - collection, @JsonArray + collection, JSON_ELEMENT record - element, @JsonValue + element, JSON_ELEMENT + itr, int + collectionSize, int endrecord proc - foreach element in collection.arrayValues + collectionSize = collection.GetArrayLength() + for itr from 0 thru collectionSize - 1 by 1 begin - if(element .is. JsonObject) then + element = collection[itr] + if(IS_OBJ(element)) then begin - data valueToken, @JsonValue + data valueToken, JSON_ELEMENT data stringValue, @string - if(((@JsonObject)element).TryGetProperty("Value", valueToken)) then + if(element.TryGetProperty("Value", valueToken)) then begin - stringValue = ((@JsonText)valueToken).Value + stringValue = valueToken.GetString() end else begin - stringValue = Convert.FromBase64String(((@JsonText)((@JsonObject)element).GetProperty("Base64Value")).Value) + stringValue = element.GetProperty("Base64Value").GetStringFromBase64() end buffer(bufferPosition:elementInfo.ElementSize) = stringValue end - else if(element .is. JsonText) then + else if(IS_TEXT(element)) then begin - buffer(bufferPosition:elementInfo.ElementSize) = ((@JsonText)element).Value + buffer(bufferPosition:elementInfo.ElementSize) = element.GetString() end - else if(element .is. JsonNumber) then - begin - ^d(buffer(bufferPosition:elementInfo.ElementSize), elementInfo.DecimalPrecision) = ((@JsonNumber)element).Value - end - else if(element .is. JsonInt) then + else if(IS_NUMBER(element)) then begin if(elementInfo.DataType == FieldDataType.IntegerField) then - ^i(buffer(bufferPosition:elementInfo.ElementSize)) = ((@JsonInt)element).Value + ^i(buffer(bufferPosition:elementInfo.ElementSize)) = element.GetDecimal() else - ^d(buffer(bufferPosition:elementInfo.ElementSize), elementInfo.DecimalPrecision) = %string(((@JsonInt)element).Value) + ^d(buffer(bufferPosition:elementInfo.ElementSize), elementInfo.DecimalPrecision) = element.GetDecimal() end - else if(element .is. JsonBoolean) then + else if(IS_BOOLEAN(element)) then begin end - else if(element .is. JsonArray) + else if(IS_ARRAY(element)) begin end @@ -232,52 +252,51 @@ namespace Harmony.TraditionalBridge handle, D_HANDLE elementInfo, @ArgumentDataDefinition inout bufferPosition, i - collection, @JsonArray - record - element, @JsonValue - endrecord + collection, JSON_ELEMENT structure localStr fld, a1 endstructure - + record + element, JSON_ELEMENT + itr, int + collectionSize, int + endrecord proc - foreach element in collection.arrayValues + collectionSize = collection.GetArrayLength() + for itr from 0 thru collectionSize - 1 by 1 begin - if(element .is. JsonObject) then + element = collection[itr] + if(IS_OBJ(element)) then begin - data valueToken, @JsonValue + data valueToken, JSON_ELEMENT data stringValue, @string - if(((@JsonObject)element).TryGetProperty("Value", valueToken)) then + if(element.TryGetProperty("Value", valueToken)) then begin - stringValue = ((@JsonText)valueToken).Value + stringValue = valueToken.GetString() end else begin - stringValue = Convert.FromBase64String(((@JsonText)((@JsonObject)element).GetProperty("Base64Value")).Value) + stringValue = element.GetProperty("Base64Value").GetStringFromBase64() end MaybeLog(6, "filling handle bufferPosition: " + %string(bufferPosition) + " elementSize: " + %string(elementInfo.ElementSize)) ^m(localStr.fld(bufferPosition:elementInfo.ElementSize), handle) = stringValue end - else if(element .is. JsonText) then - begin - ^m(localStr.fld(bufferPosition:elementInfo.ElementSize), handle) = ((@JsonText)element).Value - end - else if(element .is. JsonNumber) then + else if(IS_TEXT(element)) then begin - ^d(^m(localStr.fld(bufferPosition:elementInfo.ElementSize), handle), elementInfo.DecimalPrecision) = ((@JsonNumber)element).Value + ^m(localStr.fld(bufferPosition:elementInfo.ElementSize), handle) = element.GetString() end - else if(element .is. JsonInt) then + else if(IS_NUMBER(element)) then begin if(elementInfo.DataType == FieldDataType.IntegerField) then - ^i(^m(localStr.fld(bufferPosition:elementInfo.ElementSize), handle)) = ((@JsonInt)element).Value + ^i(^m(localStr.fld(bufferPosition:elementInfo.ElementSize), handle)) = element.GetDecimal() else - ^d(^m(localStr.fld(bufferPosition:elementInfo.ElementSize), handle), elementInfo.DecimalPrecision) = %string(((@JsonInt)element).Value) + ^d(^m(localStr.fld(bufferPosition:elementInfo.ElementSize), handle), elementInfo.DecimalPrecision) = element.GetDecimal() end - else if(element .is. JsonBoolean) then + else if(IS_BOOLEAN(element)) then begin end - else if(element .is. JsonArray) + else if(IS_ARRAY(element)) begin end @@ -292,22 +311,28 @@ namespace Harmony.TraditionalBridge ;;; ;;; public method GetArgumentDataDefForCollection, @ArgumentDataDefinition - argument, @JsonObject + argument, JSON_ELEMENT in optional elementSize, int record result, @ArgumentDataDefinition dataType, i4 + temp, JSON_ELEMENT endrecord proc result = new ArgumentDataDefinition() result.ElementSize = elementSize - argument.TryGetProperty("DecimalPrecision", result.DecimalPrecision) - argument.TryGetProperty("ElementSize", result.ElementSize) - if(argument.TryGetProperty("DataType", dataType)) - result.DataType = (FieldDataType)dataType + if(argument.TryGetProperty("DecimalPrecision", temp)) + result.DecimalPrecision = temp.GetInt32() - argument.TryGetBoolProperty("ReturnedValue", result.ReturnedValue) + if(argument.TryGetProperty("ElementSize", temp)) + result.ElementSize = temp.GetInt32() + + if(argument.TryGetProperty("DataType", temp)) + result.DataType = (FieldDataType)temp.GetInt32() + + if(argument.TryGetProperty("ReturnedValue", temp)) + result.ReturnedValue = temp.GetBoolean() mreturn result @@ -316,7 +341,7 @@ namespace Harmony.TraditionalBridge ;;TODO: This needs to take an expected type parameter of some kind so we can do basic conversions int -> decimal vs int -> int public method UnwrapObjectCollection, @ArrayList - collection, @JsonArray + collection, JSON_ELEMENT record result, @ArrayList buffer, a65535 @@ -327,7 +352,7 @@ namespace Harmony.TraditionalBridge endmethod private method UnwrapJsonValue, @object - element, @JsonValue + element, JSON_ELEMENT elementIsEncoded, boolean elementType, @DataObjectMetadataBase inout elementBuffer, a @@ -336,18 +361,18 @@ namespace Harmony.TraditionalBridge optional desiredPrecision, int optional grfa, a proc - if(element .is. JsonText) then + if(IS_TEXT(element)) then begin if(^passed(desiredSize)) then begin if(!^passed(desiredType)) then begin - elementBuffer(1: desiredSize) = ((@JsonText)element).Value + elementBuffer(1: desiredSize) = element.GetString() mreturn (@*)elementBuffer(1: desiredSize) end else if(desiredType == FieldDataType.DataObjectField) then begin - elementBuffer(1: desiredSize) = ((@JsonText)element).Value + elementBuffer(1: desiredSize) = element.GetString() if(^passed(grfa)) then mreturn elementType.MakeNew(elementBuffer(1: desiredSize), grfa) else @@ -355,72 +380,47 @@ namespace Harmony.TraditionalBridge end else if(desiredType == FieldDataType.StringField) then begin - mreturn ((@JsonText)element).Value + mreturn element.GetString() end else if(desiredType == FieldDataType.AlphaField) begin - elementBuffer(1: desiredSize) = ((@JsonText)element).Value + elementBuffer(1: desiredSize) = element.GetString() mreturn (@*)elementBuffer(1: desiredSize) end end else begin - mreturn (@a)(a)((@JsonText)element).Value + mreturn (@a)(a)element.GetString() end end - else if(element .is. JsonNumber) then + else if(IS_NUMBER(element)) then begin if(!^passed(desiredType)) then begin - ^d(elementBuffer(1: 28), 10) = ((@JsonNumber)element).Value + ^d(elementBuffer(1: 28), 10) = element.GetDecimal() mreturn (@*)^d(elementBuffer(1: 28), 10) end else if(desiredType == FieldDataType.IntegerField) then begin - ^i(elementBuffer(1: desiredSize)) = ((@JsonNumber)element).Value + ^i(elementBuffer(1: desiredSize)) = element.GetInt64() mreturn (@*)^i(elementBuffer(1: desiredSize)) end else if(desiredType == FieldDataType.DecimalField) then begin - ^d(elementBuffer(1: desiredSize)) = ((@JsonNumber)element).Value + ^d(elementBuffer(1: desiredSize)) = element.GetDecimal() mreturn (@*)^d(elementBuffer(1: desiredSize)) end else if(desiredType == FieldDataType.ImpliedDecimal) then begin - ^d(elementBuffer(1: desiredSize), desiredPrecision) = ((@JsonNumber)element).Value + ^d(elementBuffer(1: desiredSize), desiredPrecision) = element.GetDecimal() mreturn (@*)^d(elementBuffer(1: desiredSize), desiredPrecision) end else throw new Exception("invalid desired type " + %string(desiredType)) end - else if(element .is. JsonInt) then + else if(IS_BOOLEAN(element)) begin - if(!^passed(desiredType)) then - begin - ^i(elementBuffer(1: 8)) = ((@JsonInt)element).Value - mreturn (@*)^i(elementBuffer(1: 8)) - end - else if(desiredType == FieldDataType.IntegerField) then - begin - ^i(elementBuffer(1: desiredSize)) = ((@JsonInt)element).Value - mreturn (@*)^i(elementBuffer(1: desiredSize)) - end - else if(desiredType == FieldDataType.DecimalField) then - begin - ^d(elementBuffer(1: desiredSize)) = ((@JsonInt)element).Value - mreturn (@*)^d(elementBuffer(1: desiredSize)) - end - else if(desiredType == FieldDataType.ImpliedDecimal) then - begin - ^d(elementBuffer(1: desiredSize), desiredPrecision) = ((@JsonInt)element).Value - mreturn (@*)^d(elementBuffer(1: desiredSize), desiredPrecision) - end - else - throw new Exception("invalid desired type " + %string(desiredType)) - end - else if(element .is. JsonBoolean) - begin - mreturn (@boolean)((@JsonBoolean)element).Value + mreturn (@boolean)element.GetBoolean() end endmethod @@ -431,7 +431,7 @@ namespace Harmony.TraditionalBridge ;;; ;;; public method UnwrapObjectCollection, void - collection, @JsonArray + collection, JSON_ELEMENT ;;must be an arraylist or a typed dynamic array targetCollection, @Array elementIsEncoded, boolean @@ -441,20 +441,23 @@ namespace Harmony.TraditionalBridge optional desiredSize, int optional desiredPrecision, int record - element, @JsonValue + element, JSON_ELEMENT index, int + collectionLength, int endrecord proc - if(targetCollection.Length != collection.arrayValues.Count) + collectionLength = collection.GetArrayLength() + if(targetCollection.Length != collectionLength) throw new Exception("Dynamic array must be correctly sized before unwrapping object collection into it") - index = 1 - - foreach element in collection.arrayValues + + + for index from 1 thru collectionLength by 1 begin - if(element .is. JsonObject) then + element = collection[index] + if(IS_OBJ(element)) then begin - data valueToken, @JsonValue - if(((@JsonObject)element).TryGetProperty("Value", valueToken)) then + data valueToken, JSON_ELEMENT + if(element.TryGetProperty("Value", valueToken)) then begin if(elementType != ^null && ^passed(desiredType) && desiredType == FieldDataType.AlphaField) then elementType.SetIntoArray((@a)UnwrapJsonValue(valueToken, false, elementType, elementBuffer, desiredType, desiredSize, desiredPrecision), targetCollection, index) @@ -463,7 +466,7 @@ namespace Harmony.TraditionalBridge end else begin - targetCollection.SetValue(UnwrapJsonValue(((@JsonObject)element).GetProperty("Base64Value"), true, elementType, elementBuffer, desiredType, desiredSize, desiredPrecision), index) + targetCollection.SetValue(UnwrapJsonValue(element.GetProperty("Base64Value"), true, elementType, elementBuffer, desiredType, desiredSize, desiredPrecision), index) end end else @@ -478,7 +481,7 @@ namespace Harmony.TraditionalBridge endmethod public method UnwrapObjectCollection, void - collection, @JsonArray + collection, JSON_ELEMENT ;;must be an arraylist or a typed dynamic array targetCollection, @ArrayList elementIsEncoded, boolean @@ -488,21 +491,25 @@ namespace Harmony.TraditionalBridge optional desiredSize, int optional desiredPrecision, int record - element, @JsonValue + element, JSON_ELEMENT + i, int + collectionLength, int endrecord proc - foreach element in collection.arrayValues + collectionLength = collection.GetArrayLength() + for i from 0 thru collectionLength by 1 begin - if(element .is. JsonObject) then + element = collection[i] + if(IS_OBJ(element)) then begin - data valueToken, @JsonValue - if(((@JsonObject)element).TryGetProperty("Value", valueToken)) then + data valueToken, JSON_ELEMENT + if(element.TryGetProperty("Value", valueToken)) then begin targetCollection.Add(UnwrapJsonValue(valueToken, false, elementType, elementBuffer, desiredType, desiredSize, desiredPrecision)) end else begin - targetCollection.Add(UnwrapJsonValue(((@JsonObject)element).GetProperty("Base64Value"), true, elementType, elementBuffer, desiredType, desiredSize, desiredPrecision)) + targetCollection.Add(UnwrapJsonValue(element.GetProperty("Base64Value"), true, elementType, elementBuffer, desiredType, desiredSize, desiredPrecision)) end end else @@ -513,90 +520,97 @@ namespace Harmony.TraditionalBridge endmethod public method UnwrapStringArray, [#]@string - collection, @JsonArray + collection, JSON_ELEMENT record result, [#]@string - element, @JsonValue + element, JSON_ELEMENT i, int + collectionLength, int endrecord proc - i = 1 - result = new String[collection.arrayValues.Count] - foreach element in collection.arrayValues + collectionLength = collection.GetArrayLength() + result = new string[collectionLength] + for i from 0 thru collectionLength by 1 begin - if(element .is. JsonText) then + element = collection[i] + if(IS_TEXT(element)) then begin - result[i] = ((@JsonText)element).Value + result[i] = element.GetString() end else throw new InvalidCastException() - incr i end mreturn result endmethod public method UnwrapIntArray, [#]int - collection, @JsonArray + collection, JSON_ELEMENT record result, [#]int - element, @JsonValue + element, JSON_ELEMENT i, int + collectionLength, int + endrecord proc - i = 1 - result = new int[collection.arrayValues.Count] - foreach element in collection.arrayValues + collectionLength = collection.GetArrayLength() + result = new int[collectionLength] + for i from 0 thru collectionLength by 1 begin - if(element .is. JsonInt) then + element = collection[i] + if(IS_NUMBER(element)) then begin - result[i] = ((@JsonInt)element).Value + result[i + 1] = element.GetInt32() end else throw new InvalidCastException() - incr i end mreturn result endmethod public method UnwrapBoolArray, [#]boolean - collection, @JsonArray + collection, JSON_ELEMENT record result, [#]boolean - element, @JsonValue + element, JSON_ELEMENT i, int + collectionLength, int + endrecord proc - i = 1 - result = new boolean[collection.arrayValues.Count] - foreach element in collection.arrayValues + collectionLength = collection.GetArrayLength() + result = new boolean[collectionLength] + for i from 0 thru collectionLength by 1 begin - if(element .is. JsonBoolean) then + element = collection[i] + if(IS_BOOLEAN(element)) then begin - result[i] = ((@JsonBoolean)element).Value + result[i + 1] = element.GetBoolean() end else throw new InvalidCastException() - incr i end mreturn result endmethod public method UnwrapImpliedDecimalArray, [#]@id - collection, @JsonArray + collection, JSON_ELEMENT record result, [#]@id - element, @JsonValue - i, int + element, JSON_ELEMENT + i, int + collectionLength, int + endrecord proc - i = 1 - result = new @id[collection.arrayValues.Count] - foreach element in collection.arrayValues + collectionLength = collection.GetArrayLength() + result = new @id[collectionLength] + for i from 0 thru collectionLength by 1 begin - if(element .is. JsonNumber) then + element = collection[i] + if(IS_NUMBER(element)) then begin - result[i] = (@id)((@JsonNumber)element).Value + result[i + 1] = (@id)element.GetDecimal() end else throw new InvalidCastException() - incr i end mreturn result endmethod @@ -606,14 +620,10 @@ namespace Harmony.TraditionalBridge ;;; ;;; ;;; - public method GetText, a - value, @JsonObject - record - valueText, @JsonText - endrecord + public method GetText, @string + value, JSON_ELEMENT proc - valueText = (@JsonText)value.GetProperty("PassedValue") - mreturn valueText.Value + mreturn value.GetProperty("PassedValue").GetString() endmethod ;;; @@ -622,23 +632,15 @@ namespace Harmony.TraditionalBridge ;;; ;;; public method GetInt, i - value, @JsonObject - record - valueInt, @JsonInt - endrecord + value, JSON_ELEMENT proc - valueInt = (@JsonInt)value.GetProperty("PassedValue") - mreturn valueInt.Value + mreturn value.GetProperty("PassedValue").GetInt64() endmethod - public method GetArray, @JsonArray - value, @JsonObject - record - valueArray, @JsonArray - endrecord + public method GetArray, JSON_ELEMENT + value, JSON_ELEMENT proc - valueArray = (@JsonArray)value.GetProperty("PassedValue") - mreturn valueArray + mreturn value.GetProperty("PassedValue") endmethod ;;; @@ -647,26 +649,17 @@ namespace Harmony.TraditionalBridge ;;; ;;; public method GetDecimal, d - value, @JsonObject + value, JSON_ELEMENT record - passedValue, @JsonValue - valueInt, @JsonInt - valuestring, @JsonText - tempD, d28 + passedValue, JSON_ELEMENT endrecord proc + passedValue = value.GetProperty("PassedValue") - if(passedValue.JsonType == JSON_TYPE.INT_VAL ) then - begin - valueInt = (@JsonInt)passedValue - tempD = valueInt.Value - mreturn tempD - end + if(IS_TEXT(passedValue)) then + mreturn ^d((a)passedValue.GetString()) else - begin - valuestring = (@JsonText)passedValue - mreturn ^d((a)valuestring.Value) - end + mreturn passedValue.GetDecimal() endmethod ;;; @@ -675,32 +668,19 @@ namespace Harmony.TraditionalBridge ;;; ;;; public method GetImplied, d. - value, @JsonObject + value, JSON_ELEMENT record - passedValue, @JsonValue - valueInt, @JsonInt - precisionValue, @JsonValue - precisionInt, @JsonInt - valuestring, @JsonText - tempD, d56.28 + precisionValue, d18 + passedValue, JSON_ELEMENT endrecord proc passedValue = value.GetProperty("PassedValue") + precisionValue = value.GetProperty("DecimalPrecision").GetDecimal() - precisionValue = value.GetProperty("DecimalPrecision") - precisionInt = (@JsonInt)precisionValue - - if(passedValue.JsonType == JSON_TYPE.INT_VAL ) then - begin - valueInt = (@JsonInt)passedValue - tempD = ^d(%string(valueInt.Value),precisionInt.Value) - mreturn tempD - end + if(IS_TEXT(passedValue)) then + mreturn %implied(passedValue.GetString()) else - begin - valuestring = (@JsonText)passedValue - mreturn %implied((a)valuestring.Value) - end + mreturn ^d(%string(passedValue.GetDecimal()),precisionValue) endmethod ;;; @@ -710,15 +690,13 @@ namespace Harmony.TraditionalBridge ;;; ;;; public method DeserializeObject, @object - obj, @JsonObject + obj, JSON_ELEMENT out dataType, FieldDataType record - dataTypeInt, @JsonInt - propValue, @JsonValue + propValue, JSON_ELEMENT endrecord proc - dataTypeInt = ((@JsonInt)obj.GetProperty("DataType")) - dataType = (FieldDataType)dataTypeInt.Value + dataType = (FieldDataType)obj.GetProperty("DataType").GetInt32() if(dataType == FieldDataType.DataObjectField) then begin mreturn DeserializeObject(obj, ^null) @@ -736,8 +714,7 @@ namespace Harmony.TraditionalBridge mreturn (@object)"" else begin - data textObject, @JsonText, ((@JsonText)propValue) - mreturn textObject.Value + mreturn propValue.GetString() end end else if(dataType == FieldDataType.DecimalField) then @@ -748,7 +725,7 @@ namespace Harmony.TraditionalBridge end else begin - mreturn ((@JsonText)propValue).Value + mreturn propValue.GetString() end end else if(dataType == FieldDataType.ImpliedDecimal) then @@ -759,14 +736,14 @@ namespace Harmony.TraditionalBridge end else begin - mreturn ((@JsonText)propValue).Value + mreturn propValue.GetString() end end else if(dataType == FieldDataType.IntegerField) begin data intValue, i4, 0 if(propValue != ^null) - intValue = ((@JsonInt)propValue).Value + intValue = propValue.GetInt32() mreturn (@object)intValue end @@ -786,8 +763,12 @@ namespace Harmony.TraditionalBridge required in leftovers, a required in leftoversLength, i record +.ifdef DBLV11 + jsonDoc, @JsonDocument +.else jsonReader, @Json - parsedJson, @JsonValue +.endc + parsedJson, JSON_ELEMENT serializer, @DispatchSerializer result, boolean readerPosition, int @@ -797,7 +778,9 @@ namespace Harmony.TraditionalBridge innerHandle, D_HANDLE endrecord proc +.ifndef DBLV11 jsonReader = new Json() +.endc serializer = new DispatchSerializer(new ChannelOutputStream(ttChannel)) ;;reuse the same buffer if possible if(mReadBufferSize < frameHeader) @@ -848,48 +831,55 @@ namespace Harmony.TraditionalBridge MaybeLog(6, "Dispatcher: Parsing buffer " + ^m(MemStruct(1:64000), mReadBuffer)) else MaybeLog(6, "Dispatcher: Parsing buffer " + ^m(MemStruct(1:frameHeader), mReadBuffer)) - ;innerHandle = %mem_proc(DM_REG, readerPosition - 1, ^addr(^m(MemStruct(1:1), mReadBuffer))) +.ifdef DBLV11 + innerString = %string_from_handle(mReadBuffer) + jsonDoc = JsonDocument.Parse(innerString.Substring(0, readerPosition - 1)) + parsedJson = jsonDoc.RootElement +.else innerString = %string_from_handle(mReadBuffer) parsedJson = jsonReader.ParseJson(innerString.Substring(0, readerPosition - 1)) - if (!(parsedJson .is. @JsonObject) && !(parsedJson .is. @JsonArray)) +.endc + if (!(IS_OBJ(parsedJson)) && !(IS_ARRAY(parsedJson))) begin - serializer.ReportError("failed to parse json request", (int)-32700, (int)-1) + serializer.ReportError("failed to parse json request", (int)-32700, (int)-1) mreturn true end MaybeLog(5, "Dispatcher: Finished Json Parsing") result = true - if(parsedJson .is. JsonObject) then + if(IS_OBJ(parsedJson)) then begin MaybeLog(5, "Dispatcher: Single Call") - result = ProcessCallBlock((@JsonObject)parsedJson, serializer) + result = ProcessCallBlock(parsedJson, serializer) end - else if(parsedJson .is. JsonArray) + else if(IS_ARRAY(parsedJson)) begin - data parsedArray, @JsonArray - data jsonVal, @JsonValue - parsedArray = (@JsonArray)parsedJson - + data jsonVal, JSON_ELEMENT + data i, int + data collectionSize, int MaybeLog(5, "Dispatcher: Batch Call") + collectionSize = parsedJson.GetArrayLength() + serializer.ArrayOpen() - foreach jsonVal in parsedArray.arrayValues + for i from 1 thru collectionSize - 1 by 1 begin - if(jsonVal .is. JsonObject) then + jsonVal = parsedJson[i] + if(IS_OBJ(jsonVal)) then begin - result = ProcessCallBlock((@JsonObject)parsedJson, serializer) + result = ProcessCallBlock(parsedJson, serializer) if(!result) exitloop end else begin - serializer.ReportError("failed to parse json request", (int)-32700, (int)-1) + serializer.ReportError("failed to parse json request", (int)-32700, (int)-1) end - end + end serializer.ArrayClose() - end - serializer.Flush() + end + serializer.Flush() flush(ttChannel) mreturn result @@ -988,7 +978,7 @@ namespace Harmony.TraditionalBridge try begin data serializer = new DispatchSerializer(new ChannelOutputStream(ttChannel)) - serializer.ReportError(ex.ToString(), (int)-32603, (int)-1) + serializer.ReportError(ex.ToString(), (int)-32603, (int)-1) end catch(ex2, @Exception) begin @@ -1007,22 +997,28 @@ namespace Harmony.TraditionalBridge ;;; ;;; public method ProcessCallBlock, boolean - jsonData, @JsonObject + jsonData, JSON_ELEMENT serializer, @DispatchSerializer record requestId, int name, @string - argArrayList, @ArrayList dispatchStub, @RoutineStub + temp, JSON_ELEMENT endrecord proc - if(!jsonData.TryGetProperty("id", requestId)) + if(jsonData.TryGetProperty("id", temp)) then + requestId = temp.GetInt32() + else requestId = -1 - if(!jsonData.TryGetProperty("method", name)) + if(jsonData.TryGetProperty("method", temp)) then begin - serializer.ReportError("method name missing", (int)-32600, requestId) + name = temp.GetString() + end + else + begin + serializer.ReportError("method name missing", (int)-32600, requestId) end MaybeLog(5, "Dispatcher: method target was " + name) @@ -1036,59 +1032,76 @@ namespace Harmony.TraditionalBridge if(name == "rpc.shutdown") then begin ;;we've been asked to shutdown so return false and let the outer loop take care of it - serializer.ReportResult(requestId, 0) + serializer.ReportResult(requestId, 0) serializer.OutputScopeClose() mreturn false end else if(name == "rpc.ping") then begin - serializer.ReportResult(requestId, 0) + serializer.ReportResult(requestId, 0) end else if(name == "rpc.serializer_protocol") then begin - serializer.ReportResult(requestId, "1.0") + serializer.ReportResult(requestId, "1.0") end else if(name == "rpc.set_log_level") then begin - data logArg, @JsonInt - argArrayList = ((@JsonArray)jsonData.GetProperty("params")).arrayValues - - if(argArrayList.Count != 1 || !(argArrayList[0] .is. JsonObject)) then - serializer.ReportError("invalid parameters for rpc.set_log_level", (int)-32602, requestId) + data paramsArray = jsonData.GetProperty("params") + data paramsArrayLength = paramsArray.GetArrayLength() + if(paramsArrayLength != 1) then + serializer.ReportError("invalid parameters for rpc.set_log_level", (int)-32602, requestId) else begin - data settingsArgumentData = (@JsonObject)argArrayList[0] - data passedValueProp = settingsArgumentData.GetProperty("PassedValue") - data passedValue = (@JsonObject)passedValueProp + data settingsArgumentData = paramsArray[0] + data passedValue = settingsArgumentData.GetProperty("PassedValue") data targetLogSettings = new LoggerScopeSettings() + data tempElement, JSON_ELEMENT + data complete = true if(passedValue == ^null) - serializer.ReportError("invalid parameters for rpc.set_log_level", (int)-32602, requestId) - - passedValue.TryGetProperty("ScopeIdentifier", targetLogSettings.ScopeIdentifier) - passedValue.TryGetProperty("LogLocation", targetLogSettings.LogLocation) - if(!(passedValue.TryGetBoolProperty("LogToMemory", targetLogSettings.LogToMemory) && - & passedValue.TryGetBoolProperty("LogToDisk", targetLogSettings.LogToDisk) && - & passedValue.TryGetBoolProperty("FlushLog", targetLogSettings.FlushLog) && - & passedValue.TryGetProperty("OnDiskLogLevel", targetLogSettings.OnDiskLogLevel) && - & passedValue.TryGetProperty("InMemoryLogLevel", targetLogSettings.InMemoryLogLevel) && - & passedValue.TryGetBoolProperty("AttachLogsToExceptions", targetLogSettings.AttachLogsToExceptions))) + serializer.ReportError("invalid parameters for rpc.set_log_level", (int)-32602, requestId) + + if(passedValue.TryGetProperty("ScopeIdentifier", tempElement)) + targetLogSettings.ScopeIdentifier = tempElement.GetString() + + if(passedValue.TryGetProperty("LogLocation", tempElement)) + targetLogSettings.LogLocation = tempElement.GetString() + + if(complete = (complete && passedValue.TryGetProperty("LogToMemory", tempElement))) + targetLogSettings.LogToMemory = tempElement.GetBoolean() + + if(complete = (complete && passedValue.TryGetProperty("LogToDisk", tempElement))) + targetLogSettings.LogToDisk = tempElement.GetBoolean() + + if(complete = (complete && passedValue.TryGetProperty("FlushLog", tempElement))) + targetLogSettings.FlushLog = tempElement.GetBoolean() + + if(complete = (complete && passedValue.TryGetProperty("OnDiskLogLevel", tempElement))) + targetLogSettings.OnDiskLogLevel = tempElement.GetInt32() + + if(complete = (complete && passedValue.TryGetProperty("InMemoryLogLevel", tempElement))) + targetLogSettings.InMemoryLogLevel = tempElement.GetInt32() + + if(complete = (complete && passedValue.TryGetProperty("AttachLogsToExceptions", tempElement))) + targetLogSettings.AttachLogsToExceptions = tempElement.GetBoolean() + + if(!complete) Logger.Instance.Log("incomplete log settings object was passed") Logger.Instance.SetRootScope(targetLogSettings) - serializer.ReportResult(requestId, 0) + serializer.ReportResult(requestId, 0) end end else if(name == "rpc.chain") then begin ;;TODO: flush everything out and stop chain to ourselves - serializer.ReportError("rpc.chain not yet implemented", -32603, requestId) + serializer.ReportError("rpc.chain not yet implemented", -32603, requestId) end else begin ;;extension method was called but isnt supported - serializer.ReportError("unknown extension method", -32601, requestId) + serializer.ReportError("unknown extension method", -32601, requestId) end end else @@ -1109,13 +1122,13 @@ namespace Harmony.TraditionalBridge catch(rtnNotFound, @RoutineNotFound) begin serializer.OutputScopeAbort() - serializer.ReportError(rtnNotFound.ToString(), -32601, requestId) + serializer.ReportError(rtnNotFound.ToString(), -32601, requestId) end catch(ex, @Exception) begin serializer.OutputScopeAbort() ;;TODO maybe this should be a specific type, we might need to do additional processing for certain exception types here - serializer.ReportError(ex.ToString(), -32000, requestId) + serializer.ReportError(ex.ToString(), -32000, requestId) end endtry @@ -1137,25 +1150,25 @@ namespace Harmony.TraditionalBridge ;;; protected abstract method DispatchInternal, void name, @string - callFrame, @JsonObject + callFrame, JSON_ELEMENT serializer, @DispatchSerializer dispatcher, @RoutineDispatcher proc - endmethod - - public method Dispatch, void - name, @string - callFrame, @JsonObject - serializer, @DispatchSerializer - dispatcher, @RoutineDispatcher - record - requestId, int - proc - serializer.ReportResponseProlog(callFrame.TryGetProperty("id", requestId), requestId) - DispatchInternal(name, callFrame, serializer, dispatcher) - serializer.ReportResponseEpilog() - endmethod + endmethod + + public method Dispatch, void + name, @string + callFrame, JSON_ELEMENT + serializer, @DispatchSerializer + dispatcher, @RoutineDispatcher + record + idElement, JSON_ELEMENT + proc + serializer.ReportResponseProlog(callFrame.TryGetProperty("id", idElement), idElement.GetInt32()) + DispatchInternal(name, callFrame, serializer, dispatcher) + serializer.ReportResponseEpilog() + endmethod public method RCBInit, void required in targetMethod, a @@ -1173,7 +1186,7 @@ namespace Harmony.TraditionalBridge public method RCBArg, void index, int - argObject, @JsonObject + argObject, JSON_ELEMENT argType, FieldDataType inout argBuffer, a rcbid, D_HANDLE @@ -1182,7 +1195,8 @@ namespace Harmony.TraditionalBridge record argLength, i4 argPrecision, i4 - argValue, @JsonValue + argValue, JSON_ELEMENT + argEncodedProp, JSON_ELEMENT argIsEncoded, boolean proc argLength = ^size(argBuffer) @@ -1193,46 +1207,48 @@ namespace Harmony.TraditionalBridge if(^passed(passed)) passed = true - if(!argObject.TryGetBoolProperty("ElementIsEncoded", argIsEncoded)) + if(argObject.TryGetProperty("ElementIsEncoded", argEncodedProp)) then + argIsEncoded = argEncodedProp.GetBoolean() + else argIsEncoded = false if(argType != FieldDataType.DataObjectField && argType != FieldDataType.DataObjectCollectionField) then begin - data elementSizeValue, @JsonValue - if(argObject.HasProperty("DecimalPrecision")) - argPrecision = ((@JsonInt)argObject.GetProperty("DecimalPrecision")).Value + data decimalPrecision, JSON_ELEMENT + if(argObject.TryGetProperty("DecimalPrecision", decimalPrecision)) + argPrecision = decimalPrecision.GetInt32() if(argType == FieldDataType.AlphaField) then begin if(argIsEncoded) then - argBuffer = Convert.FromBase64String(((@JsonText)argValue).Value) + argBuffer = argValue.GetStringFromBase64() else - argBuffer = ((@JsonText)argValue).Value + argBuffer = argValue.GetString() end else if(argType == FieldDataType.DecimalField) then begin - if(argValue .is. JsonNumber) then + if(IS_NUMBER(argValue)) then begin - MaybeLog(4, "argument " + %string(index) + " passed to rcb dispatcher with argType " + %string(argType) + " JsonNumber value " + %string(((@JsonNumber)argValue).Value)) - ^d(argBuffer) = ((@JsonNumber)argValue).Value - end - else if(argValue .is. JsonInt) - begin - MaybeLog(4, "argument " + %string(index) + " passed to rcb dispatcher with argType " + %string(argType) + " and arglength " + %string(argLength) + " JsonInt value " + %string(((@JsonInt)argValue).Value)) - ^d(argBuffer) = %implied(((@JsonInt)argValue).Value) + MaybeLog(4, "argument " + %string(index) + " passed to rcb dispatcher with argType " + %string(argType) + " JsonNumber value " + %string(argValue.GetDecimal())) + ^d(argBuffer) = argValue.GetDecimal() end + else + throw new Exception("Invalid argument type") end else if(argType == FieldDataType.ImpliedDecimalField) then begin if(argValue .is. JsonNumber) then - ^d(argBuffer, argBufferPrecision) = ((@JsonNumber)argValue).Value - else if(argValue .is. JsonInt) - ^d(argBuffer, argBufferPrecision) = %implied(((@JsonInt)argValue).Value) + begin + MaybeLog(4, "argument " + %string(index) + " passed to rcb dispatcher with argType " + %string(argType) + " JsonNumber value " + %string(argValue.GetDecimal())) + ^d(argBuffer, argBufferPrecision) = argValue.GetDecimal() + end + else + throw new Exception("Invalid argument type") end else if(argType == FieldDataType.IntegerField) then begin - MaybeLog(4, "argument " + %string(index) + " passed to rcb dispatcher with argType " + %string(argType) + " and arglength " + %string(argLength) + " JsonInt value " + %string(((@JsonInt)argValue).Value)) - ^i(argBuffer) = ((@JsonInt)argValue).Value + MaybeLog(4, "argument " + %string(index) + " passed to rcb dispatcher with argType " + %string(argType) + " and arglength " + %string(argLength) + " JsonInt value " + %string(argValue.GetInt64())) + ^i(argBuffer) = argValue.GetInt64() end else diff --git a/TraditionalBridge/TraditionalBridge.synproj b/TraditionalBridge/TraditionalBridge.synproj index dfc7f884..d2c15aa7 100644 --- a/TraditionalBridge/TraditionalBridge.synproj +++ b/TraditionalBridge/TraditionalBridge.synproj @@ -34,6 +34,7 @@ false Debug True + 11010100 true @@ -48,10 +49,11 @@ False $(SolutionDir)\$(Configuration)\$(Platform) TESTDIR: - x86 + x64 false Optimize True + 11010100 False