コミット: 1b284cdef6f5db2ffd340fc0963c2fa76eb6b9d2 - CleanAuLait (git)

コミットメタ情報

• リビジョン: 1b284cdef6f5db2ffd340fc0963c2fa76eb6b9d2 (tree)
• 日時: 2022-08-12 00:19:55
• 作者: yoshy <yoshy.org.bitbucket@gz.j...>
• コミッター: yoshy

ログメッセージ

[MOD] CleanAuLait から Prism 関連の実装を分離

変更サマリ

• modified: Adaptor/Boundary/Controller/IAsyncHandlerContext.cs
• modified: Adaptor/Boundary/Controller/IAsyncHandlerContextFactory.cs
• modified: Adaptor/Boundary/Controller/IHandlerContext.cs
• modified: Adaptor/Boundary/Controller/IHandlerContextFactory.cs
• modified: Adaptor/Controller/AbstractAsyncWindowController.cs
• modified: Adaptor/Controller/AbstractHandlerContextFactoryRegistrar.cs
• modified: Adaptor/Controller/AbstractWindowController.cs
• modified: Adaptor/Controller/AsyncHandlerContextFactory.cs
• delete: Adaptor/Controller/AsyncHandlerContextFactoryRegistrar.cs
• modified: Adaptor/Controller/AsyncSimpleWindowController.cs
• add: Adaptor/Controller/DI/IRequestScopeGenerator.cs
• add: Adaptor/Controller/DI/IRequestScopedProvider.cs
• modified: Adaptor/Controller/Handler/AsyncHandlerContext.cs
• modified: Adaptor/Controller/Handler/HandlerContext.cs
• modified: Adaptor/Controller/HandlerContextFactory.cs
• delete: Adaptor/Controller/HandlerContextFactoryRegistrar.cs
• modified: Adaptor/Controller/Router/AbstractUseCaseRouter.cs
• modified: Adaptor/Controller/SimpleWindowController.cs
• modified: CleanAuLait.csproj
• delete: CleanAuLaitModule.cs
• modified: Core/DI/DIException.cs
• delete: Core/DI/IRequestScopeGenerator.cs
• delete: Core/DI/RequestScopeGenerator.cs

差分

--- a/Adaptor/Boundary/Controller/IAsyncHandlerContext.cs
+++ b/Adaptor/Boundary/Controller/IAsyncHandlerContext.cs
@@ -1,7 +1,7 @@
 using CleanAuLait.Adaptor.Boundary.Controller.Handler;
+using CleanAuLait.Adaptor.Controller.DI;
 using CleanAuLait.UseCase.Request;
 using CleanAuLait.UseCase.Response;
-using Prism.Ioc;
 
 namespace CleanAuLait.Adaptor.Boundary.Controller
 {
@@ -9,7 +9,7 @@ namespace CleanAuLait.Adaptor.Boundary.Controller
     {
         Queue<IAsyncRequestHandler> HandlerQueue { get; }
 
-        IScopedProvider ScopedProvider { get; }
+        IRequestScopedProvider ScopedProvider { get; }
 
         Task<UseCaseResponse> HandleNextAsync(UseCaseRequest req, IAsyncHandlerContext context);
     }

--- a/Adaptor/Boundary/Controller/IAsyncHandlerContextFactory.cs
+++ b/Adaptor/Boundary/Controller/IAsyncHandlerContextFactory.cs
@@ -1,10 +1,10 @@
-using Prism.Ioc;
+using CleanAuLait.Adaptor.Controller.DI;
 
 namespace CleanAuLait.Adaptor.Boundary.Controller
 {
     public interface IAsyncHandlerContextFactory : IAttachHandlerQueueMap
     {
         IAsyncHandlerContext Create(
-                string handlerTypesName,IScopedProvider scopedProvider);
+                string handlerTypesName, IRequestScopedProvider scopedProvider);
     }
 }
\ No newline at end of file

--- a/Adaptor/Boundary/Controller/IHandlerContext.cs
+++ b/Adaptor/Boundary/Controller/IHandlerContext.cs
@@ -1,7 +1,7 @@
 using CleanAuLait.Adaptor.Boundary.Controller.Handler;
+using CleanAuLait.Adaptor.Controller.DI;
 using CleanAuLait.UseCase.Request;
 using CleanAuLait.UseCase.Response;
-using Prism.Ioc;
 
 namespace CleanAuLait.Adaptor.Boundary.Controller
 {
@@ -9,7 +9,7 @@ namespace CleanAuLait.Adaptor.Boundary.Controller
     {
         Queue<IRequestHandler> HandlerQueue { get; }
 
-        IScopedProvider ScopedProvider { get; }
+        IRequestScopedProvider ScopedProvider { get; }
 
         UseCaseResponse HandleNext(UseCaseRequest req, IHandlerContext context);
     }

--- a/Adaptor/Boundary/Controller/IHandlerContextFactory.cs
+++ b/Adaptor/Boundary/Controller/IHandlerContextFactory.cs
@@ -1,10 +1,10 @@
-using Prism.Ioc;
+using CleanAuLait.Adaptor.Controller.DI;
 
 namespace CleanAuLait.Adaptor.Boundary.Controller
 {
     public interface IHandlerContextFactory : IAttachHandlerQueueMap
     {
         IHandlerContext Create(
-                string handlerTypesName, IScopedProvider scopedProvider);
+                string handlerTypesName, IRequestScopedProvider scopedProvider);
     }
 }
\ No newline at end of file

--- a/Adaptor/Controller/AbstractAsyncWindowController.cs
+++ b/Adaptor/Controller/AbstractAsyncWindowController.cs
@@ -1,8 +1,7 @@
 using CleanAuLait.Adaptor.Boundary.Controller;
-using CleanAuLait.Core.DI;
+using CleanAuLait.Adaptor.Controller.DI;
 using CleanAuLait.UseCase.Request;
 using CleanAuLait.UseCase.Response;
-using Prism.Ioc;
 
 namespace CleanAuLait.Adaptor.Controller
 {
@@ -28,7 +27,7 @@ namespace CleanAuLait.Adaptor.Controller
 
         protected async Task<UseCaseResponse> ExecuteAsync(string handlerQueueName, UseCaseRequest req)
         {
-            using IScopedProvider scope = scopedGenerator.CreateScope();
+            using IRequestScopedProvider scope = scopedGenerator.CreateScope();
             IAsyncHandlerContext context = contextFactory.Create(handlerQueueName, scope);
 
             return await context.HandleNextAsync(req, context);

--- a/Adaptor/Controller/AbstractHandlerContextFactoryRegistrar.cs
+++ b/Adaptor/Controller/AbstractHandlerContextFactoryRegistrar.cs
@@ -1,5 +1,4 @@
 using CleanAuLait.Adaptor.Boundary.Controller;
-using Prism.Ioc;
 
 namespace CleanAuLait.Adaptor.Controller
 {
@@ -14,9 +13,11 @@ namespace CleanAuLait.Adaptor.Controller
             map.Add(factoryName, handlerTypes);
         }
 
-        public void Register(IContainerRegistry registry)
+        public abstract void Register();
+
+        protected Func<IFACTORY> CreateFactoryFactory()
         {
-            registry.RegisterSingleton<IFACTORY>(() =>
+            return () =>
             {
                 IFACTORY factory = new FACTORY
                 {
@@ -24,7 +25,7 @@ namespace CleanAuLait.Adaptor.Controller
                 };
 
                 return factory;
-            });
+            };
         }
     }
 }

--- a/Adaptor/Controller/AbstractWindowController.cs
+++ b/Adaptor/Controller/AbstractWindowController.cs
@@ -1,8 +1,7 @@
 using CleanAuLait.Adaptor.Boundary.Controller;
-using CleanAuLait.Core.DI;
+using CleanAuLait.Adaptor.Controller.DI;
 using CleanAuLait.UseCase.Request;
 using CleanAuLait.UseCase.Response;
-using Prism.Ioc;
 
 namespace CleanAuLait.Adaptor.Controller
 {
@@ -32,7 +31,7 @@ namespace CleanAuLait.Adaptor.Controller
         {
             lock (lockExecute)
             {
-                using IScopedProvider scope = this.scopedGenerator.CreateScope();
+                using IRequestScopedProvider scope = this.scopedGenerator.CreateScope();
                 IHandlerContext context = this.contextFactory.Create(handlerQueueName, scope);
 
                 return context.HandleNext(req, context);

--- a/Adaptor/Controller/AsyncHandlerContextFactory.cs
+++ b/Adaptor/Controller/AsyncHandlerContextFactory.cs
@@ -1,8 +1,8 @@
 using CleanAuLait.Adaptor.Boundary.Controller;
 using CleanAuLait.Adaptor.Boundary.Controller.Handler;
+using CleanAuLait.Adaptor.Controller.DI;
 using CleanAuLait.Adaptor.Controller.Handler;
 using CleanAuLait.Core.DI;
-using Prism.Ioc;
 
 namespace CleanAuLait.Adaptor.Controller
 {
@@ -10,7 +10,7 @@ namespace CleanAuLait.Adaptor.Controller
     {
         public IDictionary<string, IEnumerable<Type>> HandlerQueueMap { get; set; }
 
-        public IAsyncHandlerContext Create(string handlerQueueName, IScopedProvider scopedProvider)
+        public IAsyncHandlerContext Create(string handlerQueueName, IRequestScopedProvider scopedProvider)
         {
             if (!HandlerQueueMap.TryGetValue(handlerQueueName, out IEnumerable<Type> handlerTypes))
             {
@@ -21,7 +21,7 @@ namespace CleanAuLait.Adaptor.Controller
         }
 
         protected static IAsyncHandlerContext CreateInternal(
-                 IScopedProvider scopedProvider, IEnumerable<Type> handlerTypes)
+                 IRequestScopedProvider scopedProvider, IEnumerable<Type> handlerTypes)
         {
             Queue<IAsyncRequestHandler> queue = CreateHandlerQueue(scopedProvider, handlerTypes);
 
@@ -31,7 +31,7 @@ namespace CleanAuLait.Adaptor.Controller
         }
 
         protected static Queue<IAsyncRequestHandler> CreateHandlerQueue(
-                IScopedProvider scopedProvider, IEnumerable<Type> handlerTypes)
+                IRequestScopedProvider scopedProvider, IEnumerable<Type> handlerTypes)
         {
             Queue<IAsyncRequestHandler> queue = new();
 

--- a/Adaptor/Controller/AsyncHandlerContextFactoryRegistrar.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using CleanAuLait.Adaptor.Boundary.Controller;
-
-namespace CleanAuLait.Adaptor.Controller
-{
-    public class AsyncHandlerContextFactoryRegistrar : 
-            AbstractHandlerContextFactoryRegistrar<IAsyncHandlerContextFactory, AsyncHandlerContextFactory>
-    {
-    }
-}

--- a/Adaptor/Controller/AsyncSimpleWindowController.cs
+++ b/Adaptor/Controller/AsyncSimpleWindowController.cs
@@ -1,5 +1,5 @@
 using CleanAuLait.Adaptor.Boundary.Controller;
-using CleanAuLait.Core.DI;
+using CleanAuLait.Adaptor.Controller.DI;
 
 namespace CleanAuLait.Adaptor.Controller
 {

--- /dev/null
+++ b/Adaptor/Controller/DI/IRequestScopeGenerator.cs
@@ -0,0 +1,7 @@
+namespace CleanAuLait.Adaptor.Controller.DI
+{
+    public interface IRequestScopeGenerator
+    {
+        IRequestScopedProvider CreateScope();
+    }
+}
\ No newline at end of file

--- /dev/null
+++ b/Adaptor/Controller/DI/IRequestScopedProvider.cs
@@ -0,0 +1,7 @@
+namespace CleanAuLait.Adaptor.Controller.DI
+{
+    public interface IRequestScopedProvider : IDisposable
+    {
+        object Resolve(Type type);
+    }
+}

--- a/Adaptor/Controller/Handler/AsyncHandlerContext.cs
+++ b/Adaptor/Controller/Handler/AsyncHandlerContext.cs
@@ -1,17 +1,17 @@
 using CleanAuLait.Adaptor.Boundary.Controller;
 using CleanAuLait.Adaptor.Boundary.Controller.Handler;
+using CleanAuLait.Adaptor.Controller.DI;
 using CleanAuLait.UseCase.Request;
 using CleanAuLait.UseCase.Response;
-using Prism.Ioc;
 
 namespace CleanAuLait.Adaptor.Controller.Handler
 {
     public class AsyncHandlerContext : IAsyncHandlerContext
     {
         public Queue<IAsyncRequestHandler> HandlerQueue { get; }
-        public IScopedProvider ScopedProvider { get; }
+        public IRequestScopedProvider ScopedProvider { get; }
 
-        public AsyncHandlerContext(Queue<IAsyncRequestHandler> queue, IScopedProvider scopedProvider)
+        public AsyncHandlerContext(Queue<IAsyncRequestHandler> queue, IRequestScopedProvider scopedProvider)
         {
             this.HandlerQueue = queue;
             this.ScopedProvider = scopedProvider;

--- a/Adaptor/Controller/Handler/HandlerContext.cs
+++ b/Adaptor/Controller/Handler/HandlerContext.cs
@@ -1,17 +1,17 @@
 using CleanAuLait.Adaptor.Boundary.Controller;
 using CleanAuLait.Adaptor.Boundary.Controller.Handler;
+using CleanAuLait.Adaptor.Controller.DI;
 using CleanAuLait.UseCase.Request;
 using CleanAuLait.UseCase.Response;
-using Prism.Ioc;
 
 namespace CleanAuLait.Adaptor.Controller.Handler
 {
     public class HandlerContext : IHandlerContext
     {
         public Queue<IRequestHandler> HandlerQueue { get; }
-        public IScopedProvider ScopedProvider { get; }
+        public IRequestScopedProvider ScopedProvider { get; }
 
-        public HandlerContext(Queue<IRequestHandler> queue, IScopedProvider scopedProvider)
+        public HandlerContext(Queue<IRequestHandler> queue, IRequestScopedProvider scopedProvider)
         {
             this.HandlerQueue = queue;
             this.ScopedProvider = scopedProvider;

--- a/Adaptor/Controller/HandlerContextFactory.cs
+++ b/Adaptor/Controller/HandlerContextFactory.cs
@@ -1,8 +1,8 @@
 using CleanAuLait.Adaptor.Boundary.Controller;
 using CleanAuLait.Adaptor.Boundary.Controller.Handler;
+using CleanAuLait.Adaptor.Controller.DI;
 using CleanAuLait.Adaptor.Controller.Handler;
 using CleanAuLait.Core.DI;
-using Prism.Ioc;
 
 namespace CleanAuLait.Adaptor.Controller
 {
@@ -10,7 +10,7 @@ namespace CleanAuLait.Adaptor.Controller
     {
         public IDictionary<string, IEnumerable<Type>> HandlerQueueMap { get; set; }
 
-        public IHandlerContext Create(string handlerQueueName, IScopedProvider scopedProvider)
+        public IHandlerContext Create(string handlerQueueName, IRequestScopedProvider scopedProvider)
         {
             if (!HandlerQueueMap.TryGetValue(handlerQueueName, out IEnumerable<Type> handlerTypes))
             {
@@ -21,7 +21,7 @@ namespace CleanAuLait.Adaptor.Controller
         }
 
         protected static IHandlerContext CreateInternal(
-                IScopedProvider scopedProvider, IEnumerable<Type> handlerTypes)
+                IRequestScopedProvider scopedProvider, IEnumerable<Type> handlerTypes)
         {
             Queue<IRequestHandler> queue = CreateHandlerQueue(scopedProvider, handlerTypes);
 
@@ -31,7 +31,7 @@ namespace CleanAuLait.Adaptor.Controller
         }
 
         protected static Queue<IRequestHandler> CreateHandlerQueue(
-                IScopedProvider scopedProvider, IEnumerable<Type> handlerTypes)
+                IRequestScopedProvider scopedProvider, IEnumerable<Type> handlerTypes)
         {
             Queue<IRequestHandler> queue = new();
 

--- a/Adaptor/Controller/HandlerContextFactoryRegistrar.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using CleanAuLait.Adaptor.Boundary.Controller;
-
-namespace CleanAuLait.Adaptor.Controller
-{
-    public class HandlerContextFactoryRegistrar : 
-            AbstractHandlerContextFactoryRegistrar<IHandlerContextFactory, HandlerContextFactory>
-    {
-    }
-}

--- a/Adaptor/Controller/Router/AbstractUseCaseRouter.cs
+++ b/Adaptor/Controller/Router/AbstractUseCaseRouter.cs
@@ -1,7 +1,7 @@
-using CleanAuLait.Core.DI;
+using CleanAuLait.Adaptor.Controller.DI;
+using CleanAuLait.Core.DI;
 using CleanAuLait.UseCase.Boundary.Interactor;
 using NLog;
-using Prism.Ioc;
 
 namespace CleanAuLait.Adaptor.Controller.Router
 {
@@ -9,7 +9,7 @@ namespace CleanAuLait.Adaptor.Controller.Router
     {
         private static readonly ILogger logger = LogManager.GetCurrentClassLogger();
 
-        protected T GetComponent(IScopedProvider scopedProvider, IUseCaseRouterAware req)
+        protected T GetComponent(IRequestScopedProvider scopedProvider, IUseCaseRouterAware req)
         {
             Type interactorType = req.GetInteractorType();
 
@@ -19,14 +19,7 @@ namespace CleanAuLait.Adaptor.Controller.Router
                 return default;
             }
 
-            try
-            {
-                return (T)scopedProvider.Resolve(interactorType);
-            }
-            catch (ContainerResolutionException e)
-            {
-                throw new DIException(e);
-            }
+            return (T)scopedProvider.Resolve(interactorType);
         }
     }
 }
\ No newline at end of file

--- a/Adaptor/Controller/SimpleWindowController.cs
+++ b/Adaptor/Controller/SimpleWindowController.cs
@@ -1,5 +1,5 @@
 using CleanAuLait.Adaptor.Boundary.Controller;
-using CleanAuLait.Core.DI;
+using CleanAuLait.Adaptor.Controller.DI;
 
 namespace CleanAuLait.Adaptor.Controller
 {

--- a/CleanAuLait.csproj
+++ b/CleanAuLait.csproj
@@ -15,9 +15,7 @@
 
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="11.0.1" />
-    <PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.5" />
     <PackageReference Include="NLog" Version="5.0.1" />
-    <PackageReference Include="Prism.Core" Version="8.1.97" />
     <PackageReference Include="ReactiveProperty" Version="8.1.2" />
   </ItemGroup>
 

--- a/CleanAuLaitModule.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using CleanAuLait.Core.DI;
-using CleanAuLait.Core.Resource;
-using NLog;
-using Prism.Ioc;
-using Prism.Modularity;
-
-namespace CleanAuLait
-{
-    public class CleanAuLaitModule: IModule
-    {
-        private static readonly ILogger logger = LogManager.GetCurrentClassLogger();
-
-        public void RegisterTypes(IContainerRegistry containerRegistry)
-        {
-            //
-            // Controller
-            //
-
-            containerRegistry.RegisterSingleton<IRequestScopeGenerator, RequestScopeGenerator>();
-
-            ///
-            /// Resources
-            ///
-
-            containerRegistry.RegisterSingleton<ICaptionFormatter, CaptionFormatter>();
-
-            logger.Trace("RegisterTypes end");
-        }
-
-        public void OnInitialized(IContainerProvider containerProvider)
-        {
-            // NOP
-        }
-
-    }
-}
\ No newline at end of file

--- a/Core/DI/DIException.cs
+++ b/Core/DI/DIException.cs
@@ -3,7 +3,7 @@
 namespace CleanAuLait.Core.DI
 {
     [Serializable]
-    internal class DIException : Exception
+    public class DIException : Exception
     {
         public DIException()
         {

--- a/Core/DI/IRequestScopeGenerator.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using Prism.Ioc;
-
-namespace CleanAuLait.Core.DI
-{
-    public interface IRequestScopeGenerator
-    {
-        IScopedProvider CreateScope();
-    }
-}
\ No newline at end of file

--- a/Core/DI/RequestScopeGenerator.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Prism.Ioc;
-
-namespace CleanAuLait.Core.DI
-{
-    public class RequestScopeGenerator : IRequestScopeGenerator
-    {
-        public IScopedProvider CreateScope()
-        {
-            try
-            {
-                return GetContainer().CreateScope();
-            }
-            catch (Exception e)
-            {
-                throw new DIException(e);
-            }
-        }
-
-        protected virtual IContainerProvider GetContainer()
-        {
-            return ContainerLocator.Container;
-        }
-    }
-}