paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-13 19:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Introduce ExecuteHandler in dispatcher, allows overriding

Browse Source 
git-svn-id: trunk@28191 -
This commit is contained in:
michael 2014-07-11 06:55:36 +00:00
parent c3f24cc775
commit 0a220476a3
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/fcl-web/src/jsonrpc/fpjsonrpc.pp
View File

@ -151,10 +151,11 @@ Type
FOnStartBatch: TNotifyEvent; FOnStartBatch: TNotifyEvent;
FOptions: TJSONRPCDispatchOptions; FOptions: TJSONRPCDispatchOptions;
Protected Protected
// Find handler. If none found, nil is returned. Executes OnFindHandler if needed. // Find handler. If none found, nil is returned. Executes OnFindHandler if needed.
// On return 'DoFree' must be set to indicate that the hand // On return 'DoFree' must be set to indicate that the hand
Function FindHandler(Const AClassName,AMethodName : TJSONStringType;AContext : TJSONRPCCallContext; Out FreeObject : TComponent) : TCustomJSONRPCHandler; virtual; Function FindHandler(Const AClassName,AMethodName : TJSONStringType;AContext : TJSONRPCCallContext; Out FreeObject : TComponent) : TCustomJSONRPCHandler; virtual;
// Execute handler instance. This can be overridden to implement e.g. authentication globally before actually executing the handler.
Function ExecuteHandler(H: TCustomJSONRPCHandler; Params, ID: TJSONData; AContext: TJSONRPCCallContext): TJSONData; virtual;
// Execute method. Finds handler, and returns response. // Execute method. Finds handler, and returns response.
Function ExecuteMethod(Const AClassName, AMethodName : TJSONStringType; Params,ID : TJSONData; AContext : TJSONRPCCallContext) : TJSONData; virtual; Function ExecuteMethod(Const AClassName, AMethodName : TJSONStringType; Params,ID : TJSONData; AContext : TJSONRPCCallContext) : TJSONData; virtual;
// Check and Execute a single request. Exceptions are caught and converted to request error object. // Check and Execute a single request. Exceptions are caught and converted to request error object.
@ -720,6 +721,11 @@ begin
end; end;
end; end;
Function TCustomJSONRPCDispatcher.ExecuteHandler(H : TCustomJSONRPCHandler; Params,ID: TJSONData;AContext : TJSONRPCCallContext): TJSONData;
begin
Result:=H.Execute(Params,AContext);
end;
function TCustomJSONRPCDispatcher.ExecuteMethod(Const AClassName,AMethodName: TJSONStringType; function TCustomJSONRPCDispatcher.ExecuteMethod(Const AClassName,AMethodName: TJSONStringType;
Params,ID: TJSONData;AContext : TJSONRPCCallContext): TJSONData; Params,ID: TJSONData;AContext : TJSONRPCCallContext): TJSONData;
@ -737,7 +743,7 @@ begin
try try
If Assigned(FOndispatchRequest) then If Assigned(FOndispatchRequest) then
FOndispatchRequest(Self,AClassName,AMethodName,Params); FOndispatchRequest(Self,AClassName,AMethodName,Params);
Result:=H.Execute(Params,AContext); Result:=ExecuteHandler(H,Params,ID,AContext);
finally finally
If Assigned(FreeObject) then If Assigned(FreeObject) then
FreeAndNil(FreeObject); FreeAndNil(FreeObject);