- code quality issues

Author: devgopher

3dParty/FileSignatures

@@ -51,7 +51,7 @@ protected async Task InnerSendAsyncTest(string query)
 
         AiProvider.NotNull();
 
-        await AiProvider.SendAsync(message, new CancellationToken());
+        await AiProvider!.SendAsync(message, new CancellationToken());
 
         Thread.Sleep(5000);
         var result = NoneBus.SendMessageResponses.Dequeue();
@@ -77,6 +77,6 @@ protected void Setup()
     public void TearDown()
     {
         Server.NotNull();
-        Server.Stop();
+        Server!.Stop();
     }
 }

Botticelli.AI.Test/AIProvider/BaseAiProviderTest.cs

@@ -2,7 +2,7 @@
 
 public class AiSettings : ProviderSettings
 {
-    public string Url { get; set; }
+    public string? Url { get; set; }
     public string AiName { get; set; }
     public bool StreamGeneration { get; set; }
     public string ApiKey { get; set; }

Botticelli.AI/Settings/AISettings.cs

@@ -5,7 +5,7 @@ public class Button : IControl
     public string? Image { get; set; }
     public string? Content { get; set; }
 
-    public Dictionary<string, string?>? Params { get; set; } = new();
+    public Dictionary<string, string>? Params { get; set; } = new();
 
     public Dictionary<string, Dictionary<string, object>>? MessengerSpecificParams { get; set; } = new();
 

Botticelli.Framework.Controls/BasicControls/Button.cs

@@ -9,7 +9,7 @@ public string? CallbackData
         get => Params?["CallbackData"];
         set
         {
-            if (Params != null) Params["CallbackData"] = value;
+            if (Params != null) Params["CallbackData"] = value!;
         }
     }
 

Botticelli.Framework.Controls/BasicControls/Text.cs

@@ -6,7 +6,7 @@ public class BaseLayout : ILayout
 
     public void AddRow(Row row)
     {
-        _rows.Add(row);
+        _rows?.Add(row);
     }
 
     public IList<Row>? Rows => _rows;

Botticelli.Framework.Controls/Layouts/BaseLayout.cs

@@ -46,8 +46,10 @@ public ILayout Parse(string jsonText)
                     };
 
                 if (itemElement.TryGetProperty("Specials", out var messengerSpecific))
+                {
                     item.Control.MessengerSpecificParams =
                             messengerSpecific.Deserialize<Dictionary<string, Dictionary<string, object>>>();
+                }
 
                 row.AddItem(item);
             }

Botticelli.Framework.Controls/Parsers/JsonLayoutParser.cs

@@ -22,13 +22,9 @@
 			<PackagePath></PackagePath>
 			<Link>new_logo_compact.png</Link>
 		</None>
-	</ItemGroup>
 
-	<ItemGroup>
 		<Folder Include="GoogleTts\"/>
-	</ItemGroup>
 
-	<ItemGroup>
 		<PackageReference Include="Flurl.Http" Version="4.0.2"/>
 		<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0"/>
 		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0"/>
@@ -40,7 +36,6 @@
 		<PackageReference Include="NAudio.Lame" Version="2.1.0"/>
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
 		<PackageReference Include="System.Net.Http" Version="4.3.4"/>
-		<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0"/>
 	</ItemGroup>
 
 </Project>

Botticelli.Talks/Botticelli.Talks.csproj

@@ -22,13 +22,13 @@ public void Setup()
                                                  LoggerMocks.CreateConsoleLogger<LongPollMessagesProvider>());
     }
 
-    private LongPollMessagesProvider _provider;
+    private LongPollMessagesProvider? _provider;
 
     [Test]
     public async Task StartTest()
     {
         _provider.NotNull();
-        await _provider.Stop();
+        await _provider!.Stop();
         _provider.SetApiKey(EnvironmentDataProvider.GetApiKey());
 
         var task = Task.Run(() => _provider.Start(CancellationToken.None));
@@ -41,7 +41,8 @@ public async Task StartTest()
     [Test]
     public void StopTest()
     {
-        _ = _provider.Start(CancellationToken.None);
+        _provider.NotNull();
+        _ = _provider!.Start(CancellationToken.None);
 
         Thread.Sleep(2000);
 

Tests/Botticelli.Framework.Vk.Tests/LongPollMessagesProviderTests.cs

@@ -7,28 +7,19 @@
 namespace Botticelli.Framework.Vk.Tests;
 
 [TestFixture]
-public class MessagePublisherTests
+public class MessagePublisherTests(MessagePublisher publisher)
 {
     [SetUp]
     public void Setup()
     {
         _publisher = new MessagePublisher(new TestHttpClientFactory(),
                                           LoggerMocks.CreateConsoleLogger<MessagePublisher>());
     }
-
-    public MessagePublisherTests()
-    {
-    }
-
-    private MessagePublisher _publisher;
-
-    public MessagePublisherTests(MessagePublisher publisher)
-    {
-        _publisher = publisher;
-    }
+    
+    private MessagePublisher _publisher = publisher;
 
     [Test]
-    public async Task SendAsyncTest()
+    public Task SendAsyncTest()
     {
         _publisher.SetApiKey(EnvironmentDataProvider.GetApiKey());
         Assert.DoesNotThrowAsync(async () => await _publisher.SendAsync(new VkSendMessageRequest
@@ -38,5 +29,7 @@ public async Task SendAsyncTest()
                                                                             UserId = EnvironmentDataProvider.GetTargetUserId().ToString()
                                                                         },
                                                                         CancellationToken.None));
+
+        return Task.CompletedTask;
     }
 }