addressing more PRs

Author: brettsam

src/DotNetWorker.Core/Context/Features/IDictionaryExtensions.cs

@@ -8,49 +8,59 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.ComponentModel;
 
-namespace Microsoft.Azure.Functions.Worker
+internal static class IDictionaryExtensions
 {
-    internal static class IDictionaryExtensions
+    internal static bool TryAdd<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key, TValue value)
     {
-        internal static bool TryAdd<TKey, TValue>(this IDictionary<TKey, TValue> dictionary, TKey key, TValue value)
+        if (key == null)
         {
-            if (key == null)
-            {
-                throw new ArgumentNullException(nameof(key));
-            }
-
-            if (dictionary.ContainsKey(key))
-            {
-                return false;
-            }
-
-            dictionary.Add(key, value);
-            return true;
+            throw new ArgumentNullException(nameof(key));
         }
+
+        if (dictionary.ContainsKey(key))
+        {
+            return false;
+        }
+
+        dictionary.Add(key, value);
+        return true;
     }
+}
 
-    internal static class ConcurrentDictionaryExtensions
+internal static class ConcurrentDictionaryExtensions
+{
+    public static TValue GetOrAdd<TKey, TValue, TArg>(this ConcurrentDictionary<TKey, TValue> dictionary, TKey key, Func<TKey, TArg, TValue> valueFactory, TArg factoryArgument)
     {
-        public static TValue GetOrAdd<TKey, TValue, TArg>(this ConcurrentDictionary<TKey, TValue> dictionary, TKey key, Func<TKey, TArg, TValue> valueFactory, TArg factoryArgument)
+        if (dictionary == null)
         {
-            if (dictionary == null)
-            {
-                throw new ArgumentNullException(nameof(dictionary));
-            }
-
-            if (key == null)
-            {
-                throw new ArgumentNullException(nameof(key));
-            }
-
-            if (valueFactory == null)
-            {
-                throw new ArgumentNullException(nameof(valueFactory));
-            }
-
-            return dictionary.GetOrAdd(key, k => valueFactory(k, factoryArgument));
+            throw new ArgumentNullException(nameof(dictionary));
         }
+
+        if (key == null)
+        {
+            throw new ArgumentNullException(nameof(key));
+        }
+
+        if (valueFactory == null)
+        {
+            throw new ArgumentNullException(nameof(valueFactory));
+        }
+
+        return dictionary.GetOrAdd(key, k => valueFactory(k, factoryArgument));
     }
 }
+
+internal static class KeyValuePairExtensions
+{
+    // Based on https://source.dot.net/#System.Private.CoreLib/KeyValuePair.cs,aa57b8e336bf7f59
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public static void Deconstruct<TKey, TValue>(this KeyValuePair<TKey, TValue> pair, out TKey key, out TValue value)
+    {
+        key = pair.Key;
+        value = pair.Value;
+    }
+}
+
 #endif

src/DotNetWorker.Core/Hosting/WorkerOptions.cs

@@ -58,7 +58,7 @@ public bool IncludeEmptyEntriesInMessagePayload
 
         private bool GetBoolCapability(string name)
         {
-            return Capabilities.TryGetValue(name, out string value) && bool.TryParse(value, out bool b) && b;
+            return Capabilities.TryGetValue(name, out string? value) && bool.TryParse(value, out bool b) && b;
         }
 
         // For false values, the host does not expect the capability to exist; there are some cases where this
@@ -67,7 +67,7 @@ private void SetBoolCapability(string name, bool value)
         {
             if (value)
             {
-                Capabilities[name] = value.ToString();
+                Capabilities[name] = bool.TrueString;
             }
             else
             {

src/DotNetWorker.Grpc/GrpcWorker.cs

@@ -2,7 +2,6 @@
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
@@ -213,20 +212,20 @@ internal static WorkerInitResponse WorkerInitRequestHandler(WorkerInitRequest re
 
             response.WorkerMetadata.CustomProperties.Add("Worker.Grpc.Version", typeof(GrpcWorker).Assembly.GetName().Version?.ToString());
 
-            // Add required capabilities; these cannot be modified
-            response.Capabilities.Add("RpcHttpBodyOnly", bool.TrueString);
-            response.Capabilities.Add("RawHttpBodyBytes", bool.TrueString);
-            response.Capabilities.Add("RpcHttpTriggerMetadataRemoved", bool.TrueString);
-            response.Capabilities.Add("UseNullableValueDictionaryForHttp", bool.TrueString);
-            response.Capabilities.Add("TypedDataCollection", bool.TrueString);
-            response.Capabilities.Add("WorkerStatus", bool.TrueString);
-
-            // Add additional capabilites defined by WorkerOptions
-            foreach (KeyValuePair<string, string> entry in workerOptions.Capabilities)
+            // Add additional capabilities defined by WorkerOptions
+            foreach ((string key, string value) in workerOptions.Capabilities)
             {
-                response.Capabilities.Add(entry.Key, entry.Value);
+                response.Capabilities[key] = value;
             }
 
+            // Add required capabilities; these cannot be modified and will override anything from WorkerOptions
+            response.Capabilities["RpcHttpBodyOnly"] = bool.TrueString;
+            response.Capabilities["RawHttpBodyBytes"] = bool.TrueString;
+            response.Capabilities["RpcHttpTriggerMetadataRemoved"] = bool.TrueString;
+            response.Capabilities["UseNullableValueDictionaryForHttp"] = bool.TrueString;
+            response.Capabilities["TypedDataCollection"] = bool.TrueString;
+            response.Capabilities["WorkerStatus"] = bool.TrueString;
+
             return response;
         }