BitAddict.Aras: Code cleanup

(cherry picked from commit 119261b621b122a2f3b3394c9821075e9579ae45)

Author: Marcus Sonestedt

BitAddict.Aras.OpenSource.sln.DotSettings

@@ -1,4 +1,6 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AML/@EntryIndexedValue">AML</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SQL/@EntryIndexedValue">SQL</s:String>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=amlsync/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Aras/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=arasdb/@EntryIndexedValue">True</s:Boolean>

BitAddict.Aras/ArasExtensions.cs

@@ -141,19 +141,17 @@ private static Item RunAndLogArasMethod(Func<Item, Item> method, Item item,
         public static string LogException(string msg, Exception exception)
         {
             var errMsg = msg;
-
-            var exceptions = new Queue<Exception>();
-            exceptions.Enqueue(exception);
+            var exceptions = new Queue<Exception>(new[] {exception});
 
             while (exceptions.Any())
             {
                 var e = exceptions.Dequeue();
                 errMsg += "\n<MethodException>\n" +
                           $"  {e.GetType()}: {e.Message}\n" +
                           $"  {e.Source}\n" +
-                          $"  <![CDATA[\n" +
+                          "  <![CDATA[\n" +
                           $"{e.StackTrace}\n" +
-                          $"  ]]>\n" +
+                          "  ]]>\n" +
                           "</MethodException>\n";
 
                 if (e is AggregateException ae)
@@ -187,30 +185,24 @@ public static string LogException(string msg, Exception exception)
         internal static Item WithLogger(string methodLogFile, Innovator innovator,
             Func<Item> action)
         {
-            if (ThreadLogger.Value == null || ThreadInnovator.Value == null)
+            // This happens when one of our Aras methods directly or indirectly calls another of our Aras methods.
+            if (ThreadLogger.Value != null && ThreadInnovator.Value != null)
+                return action();
+
+            using (var logger = new Logger(methodLogFile))
             {
-                using (var logger = new Logger(methodLogFile))
+                ThreadLogger.Value = logger;
+                ThreadInnovator.Value = innovator;
+
+                try
                 {
-                    ThreadLogger.Value = logger;
-                    ThreadInnovator.Value = innovator;
-
-                    try
-                    {
-                        return action();
-                    }
-                    finally
-                    {
-                        // BUG: Should not clear on recursive method calls
-
-                        ThreadLogger.Value = null;
-                        ThreadInnovator.Value = null;
-                    }
+                    return action();
+                }
+                finally
+                {
+                    ThreadLogger.Value = null;
+                    ThreadInnovator.Value = null;
                 }
-            }
-            else
-            {
-                // This happens when one of our Aras methods directly or indirectly calls another of our Aras methods.
-                return action();
             }
         }
 
@@ -269,17 +261,18 @@ public static Item ApplySQL(this Innovator innovator, [NotNull] string sqlQuery)
         /// <summary>
         /// Run and log Item query
         /// </summary>
-        /// <param name="innovator"></param>
+        /// <param name="_"></param>
         /// <param name="item"></param>
         /// <param name="logResult"></param>
         /// <returns></returns>
         /// <exception cref="ArasException"></exception>
         [NotNull]
-        public static Item ApplyItem(this Innovator innovator, [NotNull] Item item, bool logResult = true)
+        // ReSharper disable once UnusedParameter.Global
+        public static Item ApplyItem(this Innovator _, [NotNull] Item item, bool logResult = true)
         {
             Log($"<ApplyItem logresult='{logResult}'>\n  <input>\n{FormatXml(item.node)}\n  </input>\n");
 
-            var result = LogTime(() => item.apply(), "QueryTime");
+            var result = LogTime(item.apply, "QueryTime");
 
             if (logResult)
             {
@@ -318,8 +311,7 @@ public static Item GetItemByKeyedName(this Innovator innovator, [NotNull] string
         {
             Log($"<GetItemByKeyedName>\n  <input>\n    type = '{itemType}', keyedName = '{keyedName}'\n  </input>\n");
 
-            var mock = innovator as MockInnovator;
-            var result = mock != null
+            var result = innovator is MockInnovator mock
                 ? mock.getItemByKeyedName(itemType, keyedName)
                 : LogTime(() => innovator.getItemByKeyedName(itemType, keyedName), "QueryTime");
 
@@ -348,8 +340,7 @@ public static Item GetItemById(this Innovator innovator, [NotNull] string itemTy
         {
             Log($"<GetItemByID>\n  <input>\n    type = '{itemType}', id = '{id}'\n  </input>\n");
 
-            var mock = innovator as MockInnovator;
-            var result = mock != null
+            var result = innovator is MockInnovator mock
                 ? mock.getItemById(itemType, id)
                 : LogTime(() => innovator.getItemById(itemType, id), "QueryTime");
 
@@ -396,14 +387,15 @@ public static Item ApplyMethod(this Innovator innovator, [NotNull] string method
         /// <summary>
         /// Run and log fetchRelationships query
         /// </summary>
-        /// <param name="innovator"></param>
+        /// <param name="_"></param>
         /// <param name="item"></param>
         /// <param name="relationShipTypeName"></param>
         /// <param name="selectList"></param>
         /// <returns></returns>
         /// <exception cref="ArasException"></exception>
         [NotNull]
-        public static Item FetchRelationships(this Innovator innovator, [NotNull] Item item, string relationShipTypeName, string selectList = "related_id(*)")
+        // ReSharper disable once UnusedParameter.Global
+        public static Item FetchRelationships(this Innovator _, [NotNull] Item item, string relationShipTypeName, string selectList = "related_id(*)")
         {
             Log($"<FetchRelationships type='{relationShipTypeName}' " +
                 $"selectList='{selectList}'>\n" +
@@ -530,7 +522,7 @@ internal static void Log(string message)
         /// <param name="node">node to print</param>
         /// <param name="indent">default indent</param>
         /// <returns></returns>
-        static public string FormatXml(this XmlNode node, int indent = 4)
+        public static string FormatXml(this XmlNode node, int indent = 4)
         {
             if (node == null)
                 return "(null)";