Merge pull request chromelyapps#370 from xplicit/fix-warnings

Fix remaining warnings in solution
gitshaoxue · May 12, 2022 · 68a3b30 · 68a3b30
2 parents 1a09d46 + c24dd68
commit 68a3b30
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 11 deletions.
diff --git a/src/Chromely.Core/AppBuilder.cs b/src/Chromely.Core/AppBuilder.cs
@@ -105,6 +105,11 @@ public override void Run()
         {
             var appName = Assembly.GetEntryAssembly()?.GetName().Name;
             var windowController = _serviceProvider.GetService<ChromelyWindowController>();
+            if (windowController is null)
+            {
+                throw new Exception("ChromelyWindowController is not registered.");
+            }
+
             try
             {
                 Logger.Instance.Log.LogInformation("Running application:{appName}.", appName);

diff --git a/src/Chromely.Core/ChromelyApp.cs b/src/Chromely.Core/ChromelyApp.cs
@@ -227,7 +227,7 @@ public virtual void RegisterChromelyControllerAssembly(IServiceCollection servic
             return logger;
         }
 
-        var appName = Assembly.GetEntryAssembly()?.GetName().Name;
+        var appName = Assembly.GetEntryAssembly()?.GetName().Name!;
         var loggerFactory = serviceProvider.GetService<ILoggerFactory>();
         if (loggerFactory is not null)
         {
@@ -244,7 +244,7 @@ public virtual void RegisterChromelyControllerAssembly(IServiceCollection servic
     }
 
     /// <summary>
-    /// Using local resource handling requires files to be relative to the 
+    /// Using local resource handling requires files to be relative to the
     /// Expected working directory
     /// For example, if the app is launched via the taskbar the working directory gets changed to
     /// C:\Windows\system32
@@ -264,7 +264,7 @@ protected static void EnsureExpectedWorkingDirectory()
     }
 
     /// <summary>
-    /// 
+    ///
     /// </summary>
     /// <param name="config"></param>
     /// <exception cref="Exception"></exception>

diff --git a/src/Chromely.Core/ChromelyHandlersResolver.cs b/src/Chromely.Core/ChromelyHandlersResolver.cs
@@ -3,5 +3,5 @@
 
 namespace Chromely.Core;
 
-public delegate IEnumerable<object> ChromelyHandlersResolver(Type serviceType);
+public delegate IEnumerable<object?> ChromelyHandlersResolver(Type serviceType);
 
diff --git a/src/Chromely.Core/Logging/SimpleLogger.cs b/src/Chromely.Core/Logging/SimpleLogger.cs
@@ -44,7 +44,7 @@ public SimpleLogger(string? fullFilePath = null, bool logToConsole = false, int
         _maxSizeInKiloBytes = 1000 * maxFileSizeBeforeLogRotation;
     }
 
-    public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func<TState, Exception, string> formatter)
+    public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
     {
         if (!IsEnabled(logLevel))
         {

diff --git a/src/Chromely/Browser/Handlers/DefaultAssemblyResourceSchemeHandler.cs b/src/Chromely/Browser/Handlers/DefaultAssemblyResourceSchemeHandler.cs
@@ -21,7 +21,7 @@ public class DefaultAssemblyResourceSchemeHandler : CefResourceHandler
     /// Initializes a new instance of <see cref="DefaultAssemblyResourceSchemeHandler"/>.
     /// </summary>
     /// <param name="config">Instance of <see cref="IChromelyConfiguration"/>.</param>
-    /// <param name="chromelyErrorHandler"><Instance of <see cref="IChromelyErrorHandler"/>.</param>
+    /// <param name="chromelyErrorHandler">Instance of <see cref="IChromelyErrorHandler"/>.</param>
     public DefaultAssemblyResourceSchemeHandler(IChromelyConfiguration config, IChromelyErrorHandler chromelyErrorHandler)
     {
         _config = config;
@@ -87,8 +87,8 @@ protected override void GetResponseHeaders(CefResponse response, out long respon
         }
     }
 
-    [Obsolete("ReadResponse is obsolete.")]
     /// <inheritdoc/>
+    [Obsolete("ReadResponse is obsolete.")]
     protected override bool ReadResponse(Stream response, int bytesToRead, out int bytesRead, CefCallback callback)
     {
         int currBytesRead = 0;
@@ -162,7 +162,7 @@ private bool ProcessLocalFile(string file, CefCallback callback)
     {
         _fileInfo = new FileInfo(file);
 
-        // Check if file exists 
+        // Check if file exists
         if (!_fileInfo.Exists)
         {
             _chromelyResource = _chromelyErrorHandler.HandleError(_fileInfo);
@@ -219,7 +219,7 @@ private bool ProcessAssmblyEmbeddedFile(string url, string file, string fileAbso
         var manifestName = string.Join(".", option.DefaultNamespace, option.RootFolder, _regex.Replace(fileAbsolutePath, ".")).Replace("..", ".").Replace("..", ".");
         Stream? stream = option.TargetAssembly.GetManifestResourceStream(manifestName);
 
-        // Check if file exists 
+        // Check if file exists
         if (stream is null)
         {
             _chromelyResource = _chromelyErrorHandler.HandleError(stream);

diff --git a/src/Chromely/HandlerResolverHelper.cs b/src/Chromely/HandlerResolverHelper.cs
@@ -85,7 +85,7 @@ public static class HandlerResolverHelper
         return default;
     }
 
-    private static object? GetDefaultHandler(List<object> handlers, Type type)
+    private static object? GetDefaultHandler(List<object?> handlers, Type type)
     {
         if (handlers is not null && handlers.Any())
         {
@@ -103,7 +103,7 @@ public static class HandlerResolverHelper
         return default;
     }
 
-    private static object? GetFirstCustomHandler(List<object> handlers)
+    private static object? GetFirstCustomHandler(List<object?> handlers)
     {
         if (handlers is not null && handlers.Any())
         {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,5 +3,5 @@

		namespace Chromely.Core;

		public delegate IEnumerable<object> ChromelyHandlersResolver(Type serviceType);
		public delegate IEnumerable<object?> ChromelyHandlersResolver(Type serviceType);