modify dispatcher to use new middleware executor implementation

fanoframework · Feb 17, 2022 · eaf8376 · eaf8376
1 parent 95dcd10
commit eaf8376
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/Dispatcher/Factories/DispatcherFactoryImpl.pas b/src/Dispatcher/Factories/DispatcherFactoryImpl.pas
@@ -51,7 +51,8 @@ implementation
 
     DispatcherImpl,
     RequestResponseFactoryImpl,
-    MiddlewareExecutorImpl;
+    MiddlewareExecutorImpl,
+    WithExceptMiddlewareExecutorImpl;
 
     constructor TDispatcherFactory.create(
         const appMiddlewaresInst : IMiddlewareLinkList;
@@ -71,7 +72,9 @@ implementation
 
     function TDispatcherFactory.createMiddlewareExecutor() : IMiddlewareExecutor;
     begin
-        result := TMiddlewareExecutor.create(appMiddlewares);
+        result := TWithExceptMiddlewareExecutor.create(
+            TMiddlewareExecutor.create(appMiddlewares)
+        );
     end;
 
     function TDispatcherFactory.build(const container : IDependencyContainer) : IDependency;

diff --git a/src/Dispatcher/Factories/SessionDispatcherFactoryImpl.pas b/src/Dispatcher/Factories/SessionDispatcherFactoryImpl.pas
@@ -82,11 +82,11 @@ implementation
     end;
 
     function TSessionDispatcherFactory.createMiddlewareExecutor() : IMiddlewareExecutor;
-    var actualFactory : IMiddlewareExecutor;
+    var actualExecutor : IMiddlewareExecutor;
     begin
-        actualFactory := inherited createMiddlewareExecutor();
+        actualExecutor := inherited createMiddlewareExecutor();
         result := TSessionMiddlewareExecutor.create(
-            actualFactory,
+            actualExecutor,
             fSessionMgr,
             fCookieFactory,
             fExpiresInSec