From 6a5f9c3d3cacb01858d6709626cf02dde14258af Mon Sep 17 00:00:00 2001 From: CWX Date: Sat, 18 Jan 2025 13:40:39 +0000 Subject: [PATCH] use prim ctor and fixed warnings: PresetCallbacks, PrestigeCallbacks --- Core/Callbacks/PresetCallbacks.cs | 15 +++------------ Core/Callbacks/PrestigeCallbacks.cs | 24 ++++-------------------- 2 files changed, 7 insertions(+), 32 deletions(-) diff --git a/Core/Callbacks/PresetCallbacks.cs b/Core/Callbacks/PresetCallbacks.cs index f7d86996..eed0ea7f 100644 --- a/Core/Callbacks/PresetCallbacks.cs +++ b/Core/Callbacks/PresetCallbacks.cs @@ -5,21 +5,12 @@ using Core.DI; namespace Core.Callbacks; [Injectable(InjectableTypeOverride = typeof(OnLoad), TypePriority = OnLoadOrder.PresetCallbacks)] -public class PresetCallbacks : OnLoad +public class PresetCallbacks(PresetController _presetController) : OnLoad { - protected PresetController _presetController; - - public PresetCallbacks - ( - PresetController presetController - ) - { - _presetController = presetController; - } - - public async Task OnLoad() + public Task OnLoad() { _presetController.Initialize(); + return Task.CompletedTask; } public string GetRoute() diff --git a/Core/Callbacks/PrestigeCallbacks.cs b/Core/Callbacks/PrestigeCallbacks.cs index ae24e339..eb43e66d 100644 --- a/Core/Callbacks/PrestigeCallbacks.cs +++ b/Core/Callbacks/PrestigeCallbacks.cs @@ -1,33 +1,17 @@ using Core.Annotations; using Core.Controllers; -using Core.Helpers; using Core.Models.Eft.Common; -using Core.Models.Eft.Common.Tables; -using Core.Models.Eft.HttpResponse; using Core.Models.Eft.Prestige; using Core.Utils; namespace Core.Callbacks; [Injectable] -public class PrestigeCallbacks +public class PrestigeCallbacks( + HttpResponseUtil _httpResponseUtil, + PrestigeController _prestigeController +) { - protected HttpServerHelper _httpServerHelper; - protected HttpResponseUtil _httpResponseUtil; - protected PrestigeController _prestigeController; - - public PrestigeCallbacks - ( - HttpServerHelper httpServerHelper, - HttpResponseUtil httpResponseUtil, - PrestigeController prestigeController - ) - { - _httpServerHelper = httpServerHelper; - _httpResponseUtil = httpResponseUtil; - _prestigeController = prestigeController; - } - /// /// Handle client/prestige/list ///