optimize usings

EvoEsports · Dec 11, 2023 · 6f91122 · 6f91122
1 parent 679e5f5
commit 6f91122
Show file tree

Hide file tree

Showing 55 changed files with 17 additions and 99 deletions.
diff --git a/src/EvoSC.Commands/Parser/ChatCommandParser.cs b/src/EvoSC.Commands/Parser/ChatCommandParser.cs
@@ -1,6 +1,5 @@
 using EvoSC.Commands.Exceptions;
 using EvoSC.Commands.Interfaces;
-using EvoSC.Common.Interfaces.Parsing;
 
 namespace EvoSC.Commands.Parser;
 

diff --git a/src/EvoSC.Common/Config/Configuration.cs b/src/EvoSC.Common/Config/Configuration.cs
@@ -1,8 +1,8 @@
 using Config.Net;
-using EvoSC.Common.Config.Models;
-using EvoSC.Common.Config.Stores;
 using EvoSC.Common.Config.Mapping;
 using EvoSC.Common.Config.Mapping.Toml;
+using EvoSC.Common.Config.Models;
+using EvoSC.Common.Config.Stores;
 
 namespace EvoSC.Common.Config;
 

diff --git a/src/EvoSC.Common/Config/Mapping/Toml/ThemeConfigOptionsMapper.cs b/src/EvoSC.Common/Config/Mapping/Toml/ThemeConfigOptionsMapper.cs
@@ -1,6 +1,4 @@
-using System.Dynamic;
-using EvoSC.Common.Config.Models;
-using EvoSC.Common.Interfaces.Config.Mapping;
+using EvoSC.Common.Interfaces.Config.Mapping;
 using EvoSC.Common.Themes;
 using Tomlet;
 using Tomlet.Models;

diff --git a/src/EvoSC.Common/Config/Models/IEvoScBaseConfig.cs b/src/EvoSC.Common/Config/Models/IEvoScBaseConfig.cs
@@ -1,6 +1,4 @@
-using EvoSC.Common.Config.Mapping;
-using EvoSC.Common.Themes;
-using LinqToDB.Expressions;
+using EvoSC.Common.Themes;
 
 namespace EvoSC.Common.Config.Models;
 

diff --git a/src/EvoSC.Common/Config/Stores/TomlConfigStore.cs b/src/EvoSC.Common/Config/Stores/TomlConfigStore.cs
@@ -1,13 +1,10 @@
 using System.ComponentModel;
-using System.Drawing;
-using System.IO;
 using System.Reflection;
 using Config.Net;
 using EvoSC.Common.Themes;
 using EvoSC.Common.Util;
 using EvoSC.Common.Util.TextFormatting;
 using Tomlet;
-using Tomlet.Exceptions;
 using Tomlet.Models;
 
 namespace EvoSC.Common.Config.Stores;

diff --git a/src/EvoSC.Common/Database/Repository/DbRepository.cs b/src/EvoSC.Common/Database/Repository/DbRepository.cs
@@ -1,7 +1,6 @@
 
 using EvoSC.Common.Interfaces.Database;
 using LinqToDB;
-using LinqToDB.Data;
 
 namespace EvoSC.Common.Database.Repository;
 

diff --git a/src/EvoSC.Common/Interfaces/Database/IDbConnectionFactory.cs b/src/EvoSC.Common/Interfaces/Database/IDbConnectionFactory.cs
@@ -1,5 +1,4 @@
 using LinqToDB;
-using LinqToDB.Data;
 
 namespace EvoSC.Common.Interfaces.Database;
 

diff --git a/src/EvoSC.Common/Remote/ChatRouter/RemoteChatRouter.cs b/src/EvoSC.Common/Remote/ChatRouter/RemoteChatRouter.cs
@@ -5,7 +5,6 @@
 using EvoSC.Common.Middleware;
 using EvoSC.Common.Util;
 using EvoSC.Common.Util.ServerUtils;
-using EvoSC.Common.Util.TextFormatting;
 using GbxRemoteNet.Events;
 using Microsoft.Extensions.Logging;
 

diff --git a/src/EvoSC.Common/Themes/Events/Args/ThemeUpdatedEventArgs.cs b/src/EvoSC.Common/Themes/Events/Args/ThemeUpdatedEventArgs.cs
@@ -1,5 +1,3 @@
-using EvoSC.Common.Interfaces.Themes;
-
 namespace EvoSC.Common.Themes.Events.Args;
 
 public class ThemeUpdatedEventArgs : EventArgs

diff --git a/src/EvoSC.Common/Util/FormattingUtils.cs b/src/EvoSC.Common/Util/FormattingUtils.cs
@@ -1,5 +1,4 @@
 using System.Text.RegularExpressions;
-using EvoSC.Common.Interfaces.Models;
 using EvoSC.Common.Util.TextFormatting;
 
 namespace EvoSC.Common.Util;

diff --git a/src/EvoSC.Common/Util/TextFormatting/TextColor.cs b/src/EvoSC.Common/Util/TextFormatting/TextColor.cs
@@ -1,5 +1,4 @@
-using System.Diagnostics;
-using System.Drawing;
+using System.Drawing;
 
 namespace EvoSC.Common.Util.TextFormatting;
 

diff --git a/src/EvoSC.Manialinks/ManialinkController.cs b/src/EvoSC.Manialinks/ManialinkController.cs
@@ -6,7 +6,6 @@
 using EvoSC.Manialinks.Interfaces;
 using EvoSC.Manialinks.Interfaces.Validation;
 using EvoSC.Manialinks.Validation;
-using ValidationResult = System.ComponentModel.DataAnnotations.ValidationResult;
 
 namespace EvoSC.Manialinks;
 

diff --git a/src/EvoSC.Manialinks/Themes/DefaultCheckboxTheme.cs b/src/EvoSC.Manialinks/Themes/DefaultCheckboxTheme.cs
@@ -1,7 +1,6 @@
 using EvoSC.Common.Interfaces.Themes;
 using EvoSC.Common.Themes;
 using EvoSC.Common.Themes.Attributes;
-using EvoSC.Common.Util;
 
 namespace EvoSC.Manialinks.Themes;
 

diff --git a/src/EvoSC.Manialinks/Themes/DefaultRadioButtonTheme.cs b/src/EvoSC.Manialinks/Themes/DefaultRadioButtonTheme.cs
@@ -1,7 +1,6 @@
 using EvoSC.Common.Interfaces.Themes;
 using EvoSC.Common.Themes;
 using EvoSC.Common.Themes.Attributes;
-using EvoSC.Common.Util;
 
 namespace EvoSC.Manialinks.Themes;
 

diff --git a/src/EvoSC.Manialinks/Themes/DefaultTextInputTheme.cs b/src/EvoSC.Manialinks/Themes/DefaultTextInputTheme.cs
@@ -1,7 +1,6 @@
 using EvoSC.Common.Interfaces.Themes;
 using EvoSC.Common.Themes;
 using EvoSC.Common.Themes.Attributes;
-using EvoSC.Common.Util;
 
 namespace EvoSC.Manialinks.Themes;
 

diff --git a/src/EvoSC.Manialinks/Themes/DefaultToggleSwitchTheme.cs b/src/EvoSC.Manialinks/Themes/DefaultToggleSwitchTheme.cs
@@ -1,7 +1,6 @@
 using EvoSC.Common.Interfaces.Themes;
 using EvoSC.Common.Themes;
 using EvoSC.Common.Themes.Attributes;
-using EvoSC.Common.Util;
 
 namespace EvoSC.Manialinks.Themes;
 

diff --git a/src/EvoSC.Testing/Controllers/CommandInteractionControllerTestBase.cs b/src/EvoSC.Testing/Controllers/CommandInteractionControllerTestBase.cs
@@ -1,7 +1,6 @@
 using EvoSC.Commands.Interfaces;
 using EvoSC.Common.Interfaces.Controllers;
 using EvoSC.Common.Interfaces.Models;
-using Moq;
 
 namespace EvoSC.Testing.Controllers;
 

diff --git a/src/EvoSC.Testing/Controllers/ControllerContextMock.cs b/src/EvoSC.Testing/Controllers/ControllerContextMock.cs
@@ -1,7 +1,6 @@
 using EvoSC.Common.Interfaces.Controllers;
 using EvoSC.Common.Interfaces.Services;
 using EvoSC.Common.Interfaces.Util.Auditing;
-using EvoSC.Common.Util.Auditing;
 using Moq;
 
 namespace EvoSC.Testing.Controllers;

diff --git a/src/EvoSC.Testing/Controllers/ControllerMock.cs b/src/EvoSC.Testing/Controllers/ControllerMock.cs
@@ -1,5 +1,4 @@
 using EvoSC.Common.Interfaces.Controllers;
-using Moq;
 
 namespace EvoSC.Testing.Controllers;
 

diff --git a/src/EvoSC.Testing/Database/TestDbSetup.cs b/src/EvoSC.Testing/Database/TestDbSetup.cs
@@ -1,7 +1,5 @@
 using System.Reflection;
-using EvoSC.Common.Database.Migrations;
 using EvoSC.Common.Interfaces.Database;
-using FluentMigrator.Expressions;
 
 namespace EvoSC.Testing.Database;
 

diff --git a/src/EvoSC/CliCommands/ConfigGeneratorCommand.cs b/src/EvoSC/CliCommands/ConfigGeneratorCommand.cs
@@ -5,7 +5,6 @@
 using EvoSC.CLI.Attributes;
 using EvoSC.Common.Application;
 using EvoSC.Common.Config.Models;
-using EvoSC.Common.Database;
 using EvoSC.Common.Util;
 using EvoSC.Common.Util.EnumIdentifier;
 using EvoSC.Modules.Attributes;

diff --git a/src/EvoSC/InternalModules.cs b/src/EvoSC/InternalModules.cs
@@ -1,8 +1,7 @@
 using EvoSC.Common.Interfaces;
 using EvoSC.Modules.Interfaces;
-using EvoSC.Modules.Official.OpenPlanetModule;
-using EvoSC.Modules.Official.CurrentMapModule;
 using EvoSC.Modules.Official.ASayModule;
+using EvoSC.Modules.Official.CurrentMapModule;
 using EvoSC.Modules.Official.ExampleModule;
 using EvoSC.Modules.Official.FastestCpModule;
 using EvoSC.Modules.Official.LiveRankingModule;
@@ -13,6 +12,7 @@
 using EvoSC.Modules.Official.MatchTrackerModule;
 using EvoSC.Modules.Official.MotdModule;
 using EvoSC.Modules.Official.NextMapModule;
+using EvoSC.Modules.Official.OpenPlanetModule;
 using EvoSC.Modules.Official.Player;
 using EvoSC.Modules.Official.PlayerRecords;
 using EvoSC.Modules.Official.Scoreboard;

diff --git a/src/Modules/ASayModule/ASayModule.cs b/src/Modules/ASayModule/ASayModule.cs
@@ -1,13 +1,8 @@
 using EvoSC.Modules.Attributes;
-using EvoSC.Modules.Interfaces;
-using EvoSC.Modules.Official.ASayModule.Interfaces;
 
 namespace EvoSC.Modules.Official.ASayModule;
 
 [Module(IsInternal = true)]
 public class ASayModule : EvoScModule
 {
-    public ASayModule()
-    {
-    }
 }
diff --git a/src/Modules/ASayModule/Controllers/ASayController.cs b/src/Modules/ASayModule/Controllers/ASayController.cs
@@ -13,7 +13,6 @@ public class ASayController : EvoScController<CommandInteractionContext>
 
     public ASayController(IASayService asayService)
     {
-
         _asayService = asayService;
     }
 

diff --git a/src/Modules/ASayModule/Services/ASayService.cs b/src/Modules/ASayModule/Services/ASayService.cs
@@ -1,11 +1,9 @@
 using EvoSC.Common.Interfaces.Controllers;
-using EvoSC.Common.Interfaces.Localization;
 using EvoSC.Common.Services.Attributes;
 using EvoSC.Common.Services.Models;
 using EvoSC.Manialinks.Interfaces;
 using EvoSC.Modules.Official.ASayModule.Events;
 using EvoSC.Modules.Official.ASayModule.Interfaces;
-using Microsoft.Extensions.Logging;
 
 namespace EvoSC.Modules.Official.ASayModule.Services;
 

diff --git a/src/Modules/CurrentMapModule/Interfaces/ICurrentMapService.cs b/src/Modules/CurrentMapModule/Interfaces/ICurrentMapService.cs
@@ -1,5 +1,4 @@
-using EvoSC.Common.Remote.EventArgsModels;
-using GbxRemoteNet.Events;
+using GbxRemoteNet.Events;
 
 namespace EvoSC.Modules.Official.CurrentMapModule.Interfaces;
 

diff --git a/src/Modules/CurrentMapModule/Services/CurrentMapService.cs b/src/Modules/CurrentMapModule/Services/CurrentMapService.cs
@@ -8,8 +8,8 @@
 using EvoSC.Manialinks.Interfaces;
 using EvoSC.Modules.Official.CurrentMapModule.Interfaces;
 using EvoSC.Modules.Official.WorldRecordModule.Interfaces;
-using Microsoft.Extensions.Logging;
 using GbxRemoteNet.Events;
+using Microsoft.Extensions.Logging;
 
 namespace EvoSC.Modules.Official.CurrentMapModule.Services;
 

diff --git a/src/Modules/ExampleModule/ExampleController.cs b/src/Modules/ExampleModule/ExampleController.cs
@@ -2,17 +2,13 @@
 using EvoSC.Commands.Interfaces;
 using EvoSC.Common.Controllers;
 using EvoSC.Common.Controllers.Attributes;
-using EvoSC.Common.Controllers.Context;
 using EvoSC.Common.Interfaces;
 using EvoSC.Common.Interfaces.Controllers;
 using EvoSC.Common.Interfaces.Database.Repository;
 using EvoSC.Common.Interfaces.Localization;
 using EvoSC.Common.Interfaces.Services;
 using EvoSC.Common.Remote;
 using EvoSC.Common.Util;
-using EvoSC.Common.Util.MatchSettings;
-using EvoSC.Common.Util.MatchSettings.Builders;
-using EvoSC.Common.Util.MatchSettings.Models.ModeScriptSettingsModels;
 using EvoSC.Common.Util.ServerUtils;
 using EvoSC.Manialinks.Interfaces;
 using GbxRemoteNet.Events;

diff --git a/src/Modules/ExampleModule/ExampleController2.cs b/src/Modules/ExampleModule/ExampleController2.cs
@@ -1,5 +1,4 @@
-using EvoSC.Commands;
-using EvoSC.Commands.Attributes;
+using EvoSC.Commands.Attributes;
 using EvoSC.Commands.Interfaces;
 using EvoSC.Common.Controllers;
 using EvoSC.Common.Controllers.Attributes;

diff --git a/src/Modules/ExampleModule/ExampleEventController.cs b/src/Modules/ExampleModule/ExampleEventController.cs
@@ -1,13 +1,10 @@
 using EvoSC.Common.Controllers;
 using EvoSC.Common.Controllers.Attributes;
-using EvoSC.Common.Controllers.Context;
-using EvoSC.Common.Events;
 using EvoSC.Common.Events.Attributes;
 using EvoSC.Common.Interfaces.Controllers;
 using EvoSC.Common.Interfaces.Services;
 using EvoSC.Common.Remote;
 using EvoSC.Common.Remote.EventArgsModels;
-using EvoSC.Common.Util;
 using EvoSC.Manialinks.Interfaces;
 using GbxRemoteNet.Events;
 using Microsoft.Extensions.Logging;

diff --git a/src/Modules/ExampleModule/ExampleModule.cs b/src/Modules/ExampleModule/ExampleModule.cs
@@ -1,7 +1,4 @@
-using System.Reflection;
-using EvoSC.Manialinks.Interfaces;
-using EvoSC.Manialinks.Models;
-using EvoSC.Modules.Attributes;
+using EvoSC.Modules.Attributes;
 using EvoSC.Modules.Interfaces;
 
 namespace EvoSC.Modules.Official.ExampleModule;

diff --git a/src/Modules/ExampleModule/IMySettings.cs b/src/Modules/ExampleModule/IMySettings.cs
@@ -1,5 +1,4 @@
 using Config.Net;
-using EvoSC.Common.Util.EnumIdentifier;
 using EvoSC.Modules.Attributes;
 
 namespace EvoSC.Modules.Official.ExampleModule;

diff --git a/src/Modules/LiveRankingModule/Controllers/LiveRankingEventController.cs b/src/Modules/LiveRankingModule/Controllers/LiveRankingEventController.cs
@@ -1,11 +1,11 @@
 using EvoSC.Common.Controllers;
 using EvoSC.Common.Controllers.Attributes;
 using EvoSC.Common.Events.Attributes;
+using EvoSC.Common.Interfaces.Controllers;
 using EvoSC.Common.Remote;
 using EvoSC.Common.Remote.EventArgsModels;
 using EvoSC.Modules.Official.LiveRankingModule.Interfaces;
 using GbxRemoteNet.Events;
-using EvoSC.Common.Interfaces.Controllers;
 
 namespace EvoSC.Modules.Official.LiveRankingModule.Controllers;
 

diff --git a/src/Modules/MatchManagerModule/Services/MatchControlService.cs b/src/Modules/MatchManagerModule/Services/MatchControlService.cs
@@ -1,10 +1,7 @@
 using EvoSC.Common.Interfaces;
-using EvoSC.Common.Interfaces.Controllers;
-using EvoSC.Common.Interfaces.Localization;
 using EvoSC.Common.Services.Attributes;
 using EvoSC.Common.Services.Models;
 using EvoSC.Modules.Official.MatchManagerModule.Events;
-using EvoSC.Modules.Official.MatchManagerModule.Events.EventArgObjects;
 using EvoSC.Modules.Official.MatchManagerModule.Interfaces;
 
 namespace EvoSC.Modules.Official.MatchManagerModule.Services;

diff --git a/src/Modules/MatchRankingModule/Services/MatchRankingService.cs b/src/Modules/MatchRankingModule/Services/MatchRankingService.cs
@@ -8,7 +8,6 @@
 using EvoSC.Common.Util;
 using EvoSC.Manialinks.Interfaces;
 using EvoSC.Modules.Official.LiveRankingModule.Models;
-using EvoSC.Modules.Official.LiveRankingModule.Utils;
 using EvoSC.Modules.Official.MatchRankingModule.Interfaces;
 using EvoSC.Modules.Official.MatchRankingModule.Models;
 using Microsoft.Extensions.Logging;

diff --git a/src/Modules/MatchReadyModule/Controllers/MatchReadyEventController.cs b/src/Modules/MatchReadyModule/Controllers/MatchReadyEventController.cs
@@ -5,7 +5,6 @@
 using EvoSC.Common.Interfaces.Services;
 using EvoSC.Common.Remote;
 using EvoSC.Common.Util;
-using EvoSC.Manialinks.Interfaces;
 using EvoSC.Modules.Official.MatchReadyModule.Interfaces;
 using GbxRemoteNet.Events;
 

diff --git a/src/Modules/MatchReadyModule/Controllers/ReadyCommandsController.cs b/src/Modules/MatchReadyModule/Controllers/ReadyCommandsController.cs
@@ -3,7 +3,6 @@
 using EvoSC.Common.Controllers;
 using EvoSC.Common.Controllers.Attributes;
 using EvoSC.Common.Interfaces;
-using EvoSC.Manialinks.Interfaces;
 using EvoSC.Modules.Official.MatchReadyModule.Interfaces;
 
 namespace EvoSC.Modules.Official.MatchReadyModule.Controllers;

diff --git a/src/Modules/NextMapModule/NextMapModule.cs b/src/Modules/NextMapModule/NextMapModule.cs
@@ -1,5 +1,4 @@
 using EvoSC.Modules.Attributes;
-using EvoSC.Modules.Interfaces;
 
 namespace EvoSC.Modules.Official.NextMapModule;
 

diff --git a/src/Modules/WorldRecordModule/Services/WorldRecordService.cs b/src/Modules/WorldRecordModule/Services/WorldRecordService.cs
@@ -9,7 +9,6 @@
 using EvoSC.Modules.Official.WorldRecordModule.Models;
 using Flurl;
 using Flurl.Http;
-using GbxRemoteNet.Interfaces;
 using Microsoft.Extensions.Logging;
 
 namespace EvoSC.Modules.Official.WorldRecordModule.Services;

diff --git a/tests/EvoSC.Common.Tests/Database/ConfigStoreRepositoryTests.cs b/tests/EvoSC.Common.Tests/Database/ConfigStoreRepositoryTests.cs
@@ -1,7 +1,6 @@
 using System.Threading.Tasks;
 using EvoSC.Common.Database.Migrations;
 using EvoSC.Common.Database.Models.Config;
-using EvoSC.Common.Database.Repository.Permissions;
 using EvoSC.Common.Database.Repository.Stores;
 using EvoSC.Common.Interfaces.Database;
 using EvoSC.Testing.Database;

diff --git a/tests/EvoSC.Common.Tests/Database/MapRepositoryTests.cs b/tests/EvoSC.Common.Tests/Database/MapRepositoryTests.cs
@@ -3,12 +3,10 @@
 using EvoSC.Common.Database.Migrations;
 using EvoSC.Common.Database.Models.Maps;
 using EvoSC.Common.Database.Repository.Maps;
-using EvoSC.Common.Database.Repository.Players;
 using EvoSC.Common.Interfaces.Database;
 using EvoSC.Common.Interfaces.Models;
 using EvoSC.Common.Models.Maps;
 using EvoSC.Testing.Database;
-using GbxRemoteNet.Structs;
 using LinqToDB;
 using Xunit;
 

diff --git a/tests/EvoSC.Common.Tests/Database/PermissionRepositoryTests.cs b/tests/EvoSC.Common.Tests/Database/PermissionRepositoryTests.cs
@@ -3,12 +3,10 @@
 using EvoSC.Common.Database.Migrations;
 using EvoSC.Common.Database.Models.Permissions;
 using EvoSC.Common.Database.Repository.Permissions;
-using EvoSC.Common.Database.Repository.Players;
 using EvoSC.Common.Interfaces.Database;
 using EvoSC.Common.Interfaces.Models;
 using EvoSC.Common.Permissions.Models;
 using EvoSC.Testing.Database;
-using GbxRemoteNet.Structs;
 using LinqToDB;
 using Xunit;
-Original file line number
+Diff line change
@@ Expand Up @@
         public ASayController(IASayService asayService)
         {
             _asayService = asayService;
         }
@@ Expand Down @@