Core - Corrected disposable pattern usage

Core - Further nullable refactoring..

src/Artemis.Core/Services/ModuleService.cs

@@ -139,11 +139,11 @@ namespace Artemis.Core.Services
             ModulePriorityCategory category = module.DefaultPriorityCategory;
             int priority = 1;
 
-            module.Entity = _moduleRepository.GetByModuleId(module.Id);
-            if (module.Entity != null)
+            module.SettingsEntity = _moduleRepository.GetByModuleId(module.Id);
+            if (module.SettingsEntity != null)
             {
-                category = (ModulePriorityCategory) module.Entity.PriorityCategory;
-                priority = module.Entity.Priority;
+                category = (ModulePriorityCategory) module.SettingsEntity.PriorityCategory;
+                priority = module.SettingsEntity.Priority;
             }
 
             UpdateModulePriority(module, category, priority);
@@ -255,10 +255,10 @@ namespace Artemis.Core.Services
                 categoryModule.Priority = index;
 
                 // Don't save modules whose priority hasn't been initialized yet
-                if (categoryModule == module || categoryModule.Entity != null)
+                if (categoryModule == module || categoryModule.SettingsEntity != null)
                 {
                     categoryModule.ApplyToEntity();
-                    _moduleRepository.Save(categoryModule.Entity);
+                    _moduleRepository.Save(categoryModule.SettingsEntity);
                 }
             }
         }

src/Artemis.Core/Services/RgbService.cs

@@ -55,7 +55,7 @@ namespace Artemis.Core.Services
             catch (Exception e)
             {
                 _logger.Error(e, "Exception during device loading for device provider {deviceProvider}", deviceProvider.GetType().Name);
-                throw e;
+                throw;
             }
 
             if (deviceProvider.Devices == null || !deviceProvider.Devices.Any())
@@ -86,12 +86,12 @@ namespace Artemis.Core.Services
             Surface.Dispose();
         }
 
-        private void RenderScaleSettingOnSettingChanged(object sender, EventArgs e)
+        private void RenderScaleSettingOnSettingChanged(object? sender, EventArgs e)
         {
             UpdateSurfaceLedGroup();
         }
 
-        private void TargetFrameRateSettingOnSettingChanged(object sender, EventArgs e)
+        private void TargetFrameRateSettingOnSettingChanged(object? sender, EventArgs e)
         {
             UpdateTrigger.UpdateFrequency = 1.0 / _targetFrameRateSetting.Value;
         }
@@ -104,8 +104,8 @@ namespace Artemis.Core.Services
 
         #region Events
 
-        public event EventHandler<DeviceEventArgs> DeviceLoaded;
-        public event EventHandler<DeviceEventArgs> DeviceReloaded;
+        public event EventHandler<DeviceEventArgs>? DeviceLoaded;
+        public event EventHandler<DeviceEventArgs>? DeviceReloaded;
 
         public void UpdateSurfaceLedGroup()
         {

src/Artemis.Core/Services/Storage/ProfileService.cs

@@ -107,12 +107,12 @@ namespace Artemis.Core.Services
             Profile profile = new Profile(profileDescriptor.ProfileModule, profileEntity);
             InstantiateProfile(profile);
 
-            void ActivatingProfileSurfaceUpdate(object sender, SurfaceConfigurationEventArgs e)
+            void ActivatingProfileSurfaceUpdate(object? sender, SurfaceConfigurationEventArgs e)
             {
                 profile.PopulateLeds(e.Surface);
             }
 
-            void ActivatingProfilePluginToggle(object sender, PluginEventArgs e)
+            void ActivatingProfilePluginToggle(object? sender, PluginEventArgs e)
             {
                 InstantiateProfile(profile);
             }
@@ -292,12 +292,12 @@ namespace Artemis.Core.Services
 
         #region Event handlers
 
-        private void OnActiveSurfaceConfigurationSelected(object sender, SurfaceConfigurationEventArgs e)
+        private void OnActiveSurfaceConfigurationSelected(object? sender, SurfaceConfigurationEventArgs e)
         {
             ActiveProfilesPopulateLeds(e.Surface);
         }
 
-        private void OnSurfaceConfigurationUpdated(object sender, SurfaceConfigurationEventArgs e)
+        private void OnSurfaceConfigurationUpdated(object? sender, SurfaceConfigurationEventArgs e)
         {
             if (e.Surface.IsActive)
                 ActiveProfilesPopulateLeds(e.Surface);

src/Artemis.Core/Services/Storage/SurfaceService.cs

@@ -201,7 +201,7 @@ namespace Artemis.Core.Services
 
         #region Event handlers
 
-        private void RgbServiceOnDeviceLoaded(object sender, DeviceEventArgs e)
+        private void RgbServiceOnDeviceLoaded(object? sender, DeviceEventArgs e)
         {
             lock (_surfaceConfigurations)
             {
@@ -212,7 +212,7 @@ namespace Artemis.Core.Services
             UpdateSurfaceConfiguration(ActiveSurface, true);
         }
 
-        private void RenderScaleSettingOnSettingChanged(object sender, EventArgs e)
+        private void RenderScaleSettingOnSettingChanged(object? sender, EventArgs e)
         {
             foreach (ArtemisSurface surfaceConfiguration in SurfaceConfigurations)
             {