Code cleanup/resolving minor issues

Author: fabiocav

src/WebJobs.Script.WebHost/HttpException.cs

@@ -11,38 +11,36 @@ namespace Microsoft.Azure.WebJobs.Script.WebHost
 {
     public class HttpException : Exception
     {
-        private readonly int httpStatusCode;
-
         public HttpException(int httpStatusCode)
         {
-            this.httpStatusCode = httpStatusCode;
+            StatusCode = httpStatusCode;
         }
 
         public HttpException(HttpStatusCode httpStatusCode)
         {
-            this.httpStatusCode = (int)httpStatusCode;
+            StatusCode = (int)httpStatusCode;
         }
 
         public HttpException(int httpStatusCode, string message) : base(message)
         {
-            this.httpStatusCode = httpStatusCode;
+            StatusCode = httpStatusCode;
         }
 
         public HttpException(HttpStatusCode httpStatusCode, string message) : base(message)
         {
-            this.httpStatusCode = (int)httpStatusCode;
+            StatusCode = (int)httpStatusCode;
         }
 
         public HttpException(int httpStatusCode, string message, Exception inner) : base(message, inner)
         {
-            this.httpStatusCode = httpStatusCode;
+            StatusCode = httpStatusCode;
         }
 
         public HttpException(HttpStatusCode httpStatusCode, string message, Exception inner) : base(message, inner)
         {
-            this.httpStatusCode = (int)httpStatusCode;
+            StatusCode = (int)httpStatusCode;
         }
 
-        public int StatusCode { get { return this.httpStatusCode; } }
+        public int StatusCode { get; }
     }
 }

src/WebJobs.Script.WebHost/WebJobsScriptHostService.cs

@@ -222,7 +222,7 @@ public async Task StopAsync(CancellationToken cancellationToken)
 
             var currentHost = _host;
             Task stopTask = Orphan(currentHost, _logger, cancellationToken);
-            Task result = await Task.WhenAny(stopTask, Task.Delay(TimeSpan.FromSeconds(10)));
+            Task result = await Task.WhenAny(stopTask, Task.Delay(TimeSpan.FromSeconds(10), cancellationToken));
 
             if (result != stopTask)
             {
@@ -346,7 +346,7 @@ internal bool IsHostHealthy(bool throwWhenUnhealthy = false)
 
         private bool ShutdownHostIfUnhealthy()
         {
-            if (ShouldMonitorHostHealth && _healthCheckWindow.GetEvents().Where(isHealthy => !isHealthy).Count() > _healthMonitorOptions.Value.HealthCheckThreshold)
+            if (ShouldMonitorHostHealth && _healthCheckWindow.GetEvents().Count(isHealthy => !isHealthy) > _healthMonitorOptions.Value.HealthCheckThreshold)
             {
                 // if the number of times the host has been unhealthy in
                 // the current time window exceeds the threshold, recover by

src/WebJobs.Script/Binding/Extensibility/ScriptBindingContext.cs

@@ -112,10 +112,9 @@ public ScriptBindingContext(JObject bindingMetadata)
         /// <returns>The metadata value.</returns>
         public TValue GetMetadataValue<TValue>(string name, TValue defaultValue = default(TValue))
         {
-            JToken value = null;
             try
             {
-                if (Metadata.TryGetValue(name, StringComparison.OrdinalIgnoreCase, out value))
+                if (Metadata.TryGetValue(name, StringComparison.OrdinalIgnoreCase, out JToken value))
                 {
                     return value.Value<TValue>();
                 }

src/WebJobs.Script/DependencyInjection/ScriptStartupTypeLocator.cs

@@ -168,12 +168,7 @@ public bool Equals(Type x, Type y)
 
             public int GetHashCode(Type obj)
             {
-                if (obj == null)
-                {
-                    return 0;
-                }
-
-                return obj.FullName.GetHashCode();
+                return obj?.FullName?.GetHashCode() ?? 0;
             }
         }
     }

src/WebJobs.Script/Rpc/FunctionRegistration/FunctionDispatcher.cs

@@ -19,15 +19,15 @@ namespace Microsoft.Azure.WebJobs.Script.Rpc
 {
     internal class FunctionDispatcher : IFunctionDispatcher
     {
+        private readonly IMetricsLogger _metricsLogger;
+        private readonly ILoggerFactory _loggerFactory;
         private IScriptEventManager _eventManager;
-        private IMetricsLogger _metricsLogger;
         private IEnumerable<WorkerConfig> _workerConfigs;
         private CreateChannel _channelFactory;
         private ILanguageWorkerChannelManager _languageWorkerChannelManager;
         private ConcurrentDictionary<string, LanguageWorkerState> _workerStates = new ConcurrentDictionary<string, LanguageWorkerState>();
         private IDisposable _workerErrorSubscription;
         private IList<IDisposable> _workerStateSubscriptions = new List<IDisposable>();
-        private ILoggerFactory _loggerFactory;
         private ScriptJobHostOptions _scriptOptions;
         private bool disposedValue = false;
 
@@ -127,8 +127,7 @@ public void Register(FunctionRegistrationContext context)
 
         public void WorkerError(WorkerErrorEvent workerError)
         {
-            LanguageWorkerState erroredWorkerState;
-            if (_workerStates.TryGetValue(workerError.Language, out erroredWorkerState))
+            if (_workerStates.TryGetValue(workerError.Language, out LanguageWorkerState erroredWorkerState))
             {
                 erroredWorkerState.Errors.Add(workerError.Exception);
                 bool isPreInitializedChannel = _languageWorkerChannelManager.ShutdownChannelIfExists(workerError.Language);

src/WebJobs.Script/Rpc/RpcInitializationService.cs

@@ -58,7 +58,7 @@ internal async Task InitializeRpcServerAsync()
         {
             try
             {
-                _logger.LogInformation("Initializaing RpcServer");
+                _logger.LogInformation("Initializing RpcServer");
                 await _rpcServer.StartAsync();
             }
             catch (Exception grpcInitEx)