提交: 94f8f43fbb15aa9d17e755ae53465417e386b12b - CleanAuLait48 (git)

Commit MetaInfo

• 修订版: 94f8f43fbb15aa9d17e755ae53465417e386b12b (tree)
• 时间: 2022-05-21 18:41:49
• 作者: yoshy <yoshy.org.bitbucket@gz.j...>
• Commiter: yoshy

Log Message

[CLEAN] リファクタ
・ヘルパクラスをより関連のある名前空間に移動
・リソースヘルパクラスの例外処理を改善

更改概述

• modified: CleanAuLait48.csproj
• modified: Core/Resource/MessageRepository.cs
• modified: Core/Resource/ResourceHelper.cs
• delete: Core/{Helper => Converter}/JsonHelper.cs
• delete: Core/{Helper => Log}/LogHelper.cs
• modified: OuterEdge/Repository/Db/Tx/AbstractConnectionFactory.cs
• modified: OuterEdge/Repository/Db/Tx/DbConnectionWrapper.cs
• modified: OuterEdge/Repository/Db/Tx/DbTransactionWrapper.cs
• modified: OuterEdge/Repository/Db/Tx/TransactionManager.cs

差异

--- a/CleanAuLait48.csproj
+++ b/CleanAuLait48.csproj
@@ -88,8 +88,8 @@
     <Compile Include="Core\DI\IRequestScopeGenerator.cs" />
     <Compile Include="Core\DI\RequestScopeGenerator.cs" />
     <Compile Include="Core\Helper\DateTimeHelper.cs" />
-    <Compile Include="Core\Helper\JsonHelper.cs" />
-    <Compile Include="Core\Helper\LogHelper.cs" />
+    <Compile Include="Core\Converter\JsonHelper.cs" />
+    <Compile Include="Core\Log\LogHelper.cs" />
     <Compile Include="Core\Resource\IMessageRepository.cs" />
     <Compile Include="Core\Resource\MessageRepository.cs" />
     <Compile Include="Core\Resource\ResourceHelper.cs" />

--- a/Core/Helper/JsonHelper.cs
+++ b/Core/Converter/JsonHelper.cs
@@ -2,7 +2,7 @@
 using System.Runtime.Serialization.Json;
 using System.Text;
 
-namespace CleanAuLait48.Core.Helper
+namespace CleanAuLait48.Core.Converter
 {
     /// <see href="https://mokake.hatenablog.com/entry/2017/09/12/195656">
     public static class JsonHelper

--- a/Core/Helper/LogHelper.cs
+++ b/Core/Log/LogHelper.cs
@@ -1,4 +1,4 @@
-namespace CleanAuLait48.Core.Helper
+namespace CleanAuLait48.Core.Log
 {
     public static class LogHelper
     {

--- a/Core/Resource/MessageRepository.cs
+++ b/Core/Resource/MessageRepository.cs
@@ -14,7 +14,7 @@ namespace CleanAuLait48.Core.Resource
 
         private void ReadMessageResource(string nameSpace, string path, Assembly asm)
         {
-            string content = ResourceHelper.GetResourceFile(nameSpace, path, asm);
+            string content = ResourceHelper.LoadTextFromResource(nameSpace, path, asm);
 
             string[] lines = content.Split('\n');
 

--- a/Core/Resource/ResourceHelper.cs
+++ b/Core/Resource/ResourceHelper.cs
@@ -1,4 +1,5 @@
-using System;
+using NLog;
+using System;
 using System.IO;
 using System.Reflection;
 
@@ -6,30 +7,40 @@ namespace CleanAuLait48.Core.Resource
 {
     public static class ResourceHelper
     {
-        public static string GetResourceFile(string nameSpace, string path, Assembly asm)
+        private static readonly ILogger logger = LogManager.GetCurrentClassLogger();
+
+        public static string LoadTextFromResource(string nameSpace, string path, Assembly asm = null)
         {
             string resourceName = nameSpace + path;
 
-            if (asm == null)
+            try
             {
-                asm = Assembly.GetCallingAssembly();
-            }
-
-            string content = "";
-            using (var stream = asm.GetManifestResourceStream(resourceName))
-            {
-                if (stream == null)
+                if (asm == null)
                 {
-                    throw new ApplicationException($"埋め込みリソース {resourceName} が見つかりません");
+                    asm = Assembly.GetCallingAssembly();
                 }
 
-                using (var sr = new StreamReader(stream))
+                string content = "";
+                using (var stream = asm.GetManifestResourceStream(resourceName))
                 {
-                    content = sr.ReadToEnd();
+                    if (stream == null)
+                    {
+                        throw new ApplicationException($"埋め込みリソーステキスト {resourceName} が見つかりません");
+                    }
+
+                    using (var sr = new StreamReader(stream))
+                    {
+                        content = sr.ReadToEnd();
+                    }
                 }
-            }
 
-            return content;
+                return content;
+            }
+            catch (Exception e) when ((e is SystemException) || (e is IOException))
+            {
+                logger.Error(e);
+                throw new ApplicationException($"埋め込みリソーステキスト {resourceName} の読み込みに失敗しました", e);
+            }
         }
     }
 }

--- a/OuterEdge/Repository/Db/Tx/AbstractConnectionFactory.cs
+++ b/OuterEdge/Repository/Db/Tx/AbstractConnectionFactory.cs
@@ -1,4 +1,4 @@
-using CleanAuLait48.Core.Helper;
+using CleanAuLait48.Core.Log;
 using NLog;
 using System;
 using System.Collections.Generic;

--- a/OuterEdge/Repository/Db/Tx/DbConnectionWrapper.cs
+++ b/OuterEdge/Repository/Db/Tx/DbConnectionWrapper.cs
@@ -1,4 +1,4 @@
-using CleanAuLait48.Core.Helper;
+using CleanAuLait48.Core.Log;
 using NPoco;
 using System;
 using System.Data;

--- a/OuterEdge/Repository/Db/Tx/DbTransactionWrapper.cs
+++ b/OuterEdge/Repository/Db/Tx/DbTransactionWrapper.cs
@@ -1,4 +1,4 @@
-using CleanAuLait48.Core.Helper;
+using CleanAuLait48.Core.Log;
 using NLog;
 using System.Data;
 using System.Diagnostics;

--- a/OuterEdge/Repository/Db/Tx/TransactionManager.cs
+++ b/OuterEdge/Repository/Db/Tx/TransactionManager.cs
@@ -1,4 +1,4 @@
-using CleanAuLait48.Core.Helper;
+using CleanAuLait48.Core.Log;
 using NLog;
 using System.Collections.Generic;
 using System.Data;