https://github.com/danieleteti/delphimvcframework/issues/605

samples/activerecord_showcase/EntitiesU.pas

@@ -594,7 +594,9 @@ function TCustomer.ToString: String;
 begin
   Result := '';
   if PKIsNull then
-    Result := '<null>';
+    Result := '<null>'
+  else
+    Result := fID.ValueOrDefault.ToString;
   Result := Format('[ID: %6s][CODE: %6s][CompanyName: %18s][City: %16s][Rating: %3d][Note: %s]',[
     Result, fCode.ValueOrDefault, fCompanyName.ValueOrDefault, fCity, fRating.ValueOrDefault, fNote]);
 end;

samples/jsonrpc_with_published_objects/async_client/MainClientFormU.pas

@@ -511,24 +511,24 @@ begin
     end, fGeneralErrorHandler);
 end;
 
-  procedure TMainForm.btnSubtractClick(Sender: TObject);
+procedure TMainForm.btnSubtractClick(Sender: TObject);
-  var
+var
-    lReq: IJSONRPCRequest;
+  lReq: IJSONRPCRequest;
-    lExecutorAsync: IMVCJSONRPCExecutorAsync;
+  lExecutorAsync: IMVCJSONRPCExecutorAsync;
-  begin
+begin
-    lExecutorAsync := TMVCJSONRPCExecutor.Create('http://localhost:8080');
+  lExecutorAsync := TMVCJSONRPCExecutor.Create('http://localhost:8080');
-    lReq := TJSONRPCRequest.Create;
+  lReq := TJSONRPCRequest.Create;
-    lReq.Method := 'subtract';
+  lReq.Method := 'subtract';
-    lReq.RequestID := Random(1000);
+  lReq.RequestID := Random(1000);
-    lReq.Params.Add(StrToInt(edtValue1.Text));
+  lReq.Params.Add(StrToInt(edtValue1.Text));
-    lReq.Params.Add(StrToInt(edtValue2.Text));
+  lReq.Params.Add(StrToInt(edtValue2.Text));
-    lExecutorAsync
+  lExecutorAsync
-      .ExecuteRequestAsync('/jsonrpc', lReq,
+    .ExecuteRequestAsync('/jsonrpc', lReq,
-      procedure(JSONRPCResp: IJSONRPCResponse)
+    procedure(JSONRPCResp: IJSONRPCResponse)
-      begin
+    begin
-        edtResult.Text := JSONRPCResp.Result.AsInteger.ToString;
+      edtResult.Text := JSONRPCResp.Result.AsInteger.ToString;
-      end);
+    end);
-  end;
+end;
 
 procedure TMainForm.btnSubtractWithNamedParamsClick(Sender: TObject);
 var

samples/middleware_jwtblacklist/WebModuleUnit1.pas

@@ -82,16 +82,18 @@ begin
     .AddController(TAdminController)
     .AddMiddleware(
     TMVCJWTAuthenticationMiddleware.Create(
-    TAuthenticationSample.Create,
+      TAuthenticationSample.Create,
-    lClaimsSetup,
+      lClaimsSetup,
-    'mys3cr37',
+      'mys3cr37',
-    '/login',
+      '/login',
-    [
+      [
-    TJWTCheckableClaim.ExpirationTime,
+      TJWTCheckableClaim.ExpirationTime,
-    TJWTCheckableClaim.NotBefore,
+      TJWTCheckableClaim.NotBefore,
-    TJWTCheckableClaim.IssuedAt
+      TJWTCheckableClaim.IssuedAt
-    ], 300))
+      ], 300))
-    .AddMiddleware(TMVCJWTBlackListMiddleware.Create(lOnAcceptToken, lOnNewJWTToBlackList));
+    .AddMiddleware(
+      TMVCJWTBlackListMiddleware.Create(lOnAcceptToken, lOnNewJWTToBlackList)
+    );
 end;
 
 end.

samples/serversentevents/SSEControllerU.pas

@@ -1,65 +1,66 @@
 unit SSEControllerU;
-
+
-interface
+
-
+interface
-uses
+
-  MVCFramework, MVCFramework.Commons;
+uses
-
+  MVCFramework, MVCFramework.Commons;
-type
+
-
+type
-  [MVCPath('/')]
+
-  TSSEController = class(TMVCController)
+  [MVCPath('/')]
-  public
+  TSSEController = class(TMVCController)
-    [MVCPath('/stocks')]
+  public
-    [MVCHTTPMethod([httpGET])]
+    [MVCPath('/stocks')]
-    [MVCProduces('text/event-stream')]
+    [MVCHTTPMethod([httpGET])]
-    procedure Index;
+    [MVCProduces('text/event-stream')]
-
+    procedure Index;
-  protected
+
-    procedure OnBeforeAction(Context: TWebContext; const AActionName: string;
+  protected
-      var Handled: Boolean); override;
+    procedure OnBeforeAction(Context: TWebContext; const AActionName: string;
-    procedure OnAfterAction(Context: TWebContext;
+      var Handled: Boolean); override;
-      const AActionName: string); override;
+    procedure OnAfterAction(Context: TWebContext;
-  end;
+      const AActionName: string); override;
-
+  end;
-implementation
+
-
+implementation
-uses
+
-  MVCFramework.Logger, System.SysUtils, StorageU;
+uses
-
+  MVCFramework.Logger, System.SysUtils, StorageU;
-procedure TSSEController.Index;
+
-var
+procedure TSSEController.Index;
-  lLastEventID: Integer;
+var
-  lCurrentEventID: Integer;
+  lLastEventID: Integer;
-  lMessage: string;
+  lCurrentEventID: Integer;
-begin
+  lMessage: string;
-  // wait a little bit
+begin
-  Sleep(1000 + Random(2000));
+  // wait a little bit
-
+  Sleep(1000 + Random(2000));
-  // retrieve the last id received by the client reading the request header.
+
-  lLastEventID := StrToIntDef(Context.Request.Headers[TMVCConstants.SSE_LAST_EVENT_ID], 0);
+  // retrieve the last id received by the client reading the request header.
-
+  lLastEventID := StrToIntDef(Context.Request.Headers[TMVCConstants.SSE_LAST_EVENT_ID], 0);
-  // get the next message to send based on the last id already received by the client
+
-  lMessage := GetNextDataToSend(lLastEventID, lCurrentEventID);
+  // get the next message to send based on the last id already received by the client
-
+  lMessage := GetNextDataToSend(lLastEventID, lCurrentEventID);
-  RenderSSE(lCurrentEventID.ToString, lMessage, 'stockupdate');
+
-end;
+  RenderSSE(lCurrentEventID.ToString, lMessage, 'stockupdate');
-
+end;
-procedure TSSEController.OnAfterAction(Context: TWebContext;
+
-  const AActionName: string);
+procedure TSSEController.OnAfterAction(Context: TWebContext;
-begin
+  const AActionName: string);
-  { Executed after each action }
+begin
-  inherited;
+  { Executed after each action }
-end;
+  inherited;
-
+end;
-procedure TSSEController.OnBeforeAction(Context: TWebContext;
+
-  const AActionName: string; var Handled: Boolean);
+procedure TSSEController.OnBeforeAction(Context: TWebContext;
-begin
+  const AActionName: string; var Handled: Boolean);
-  { Executed before each action
+begin
-    if handled is true (or an exception is raised) the actual
+  { Executed before each action
-    action will not be called }
+    if handled is true (or an exception is raised) the actual
-  inherited;
+    action will not be called }
-end;
+  inherited;
-
+end;
+
 end.
-
+

samples/webcontextevents/MainControllerU.pas

@@ -33,7 +33,9 @@ end;
 
 procedure TMyController.DoSum(const a, b: Integer);
 begin
-  Render((Context.CustomIntfObject as ICalculator).DoCalc(a,b).ToString);
+  var lSvc := Context.CustomIntfObject as ICalculator;
+
+  Render(lSvc.DoCalc(a,b).ToString);
 end;
 
 end.

sources/MVCFramework.Middleware.ActiveRecord.pas

@@ -71,6 +71,8 @@ type
       AContext: TWebContext;
       const AHandled: Boolean);
   public
+    constructor Create(
+      const DefaultConnectionDefName: string); overload; virtual;
     constructor Create(
       const DefaultConnectionDefName: string;
       const ConnectionDefFileName: string{ = 'FDConnectionDefs.ini'}); overload; virtual;
@@ -96,10 +98,7 @@ var
 constructor TMVCActiveRecordMiddleware.Create(const DefaultConnectionDefName: string;
   const ConnectionDefFileName: string);
 begin
-  inherited Create;
+  Create(DefaultConnectionDefName, [], [], ConnectionDefFileName);
-  fConnectionLoaded := False;
-  fDefaultConnectionDefName := DefaultConnectionDefName;
-  fConnectionDefFileName := ConnectionDefFileName;
 end;
 
 constructor TMVCActiveRecordMiddleware.Create(
@@ -107,6 +106,7 @@ constructor TMVCActiveRecordMiddleware.Create(
   const AdditionalARConnectionNames, AdditionalConnectionDefNames: TArray<String>;
   const ConnectionDefFileName: string);
 begin
+  inherited Create;
   fConnectionLoaded := False;
   fDefaultConnectionDefName := DefaultConnectionDefName;
   fConnectionDefFileName := ConnectionDefFileName;
@@ -114,6 +114,12 @@ begin
   fAdditionalConnectionDefNames := AdditionalConnectionDefNames;
 end;
 
+constructor TMVCActiveRecordMiddleware.Create(
+  const DefaultConnectionDefName: string);
+begin
+  Create(DefaultConnectionDefName, 'FDConnectionDefs.ini');
+end;
+
 procedure TMVCActiveRecordMiddleware.EnsureConnection;
 var
   I: Integer;