remove newtonsoft package, clean nullability

skbkontur · Nov 15, 2024 · f0db6cc · f0db6cc
1 parent 636ea27
commit f0db6cc
Show file tree

Hide file tree

Showing 21 changed files with 123 additions and 157 deletions.
diff --git a/...Queue.Monitoring.TestService/Cassandra.DistributedTaskQueue.Monitoring.TestService.csproj b/...Queue.Monitoring.TestService/Cassandra.DistributedTaskQueue.Monitoring.TestService.csproj
@@ -9,7 +9,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.16" />
     <PackageReference Include="SkbKontur.TypeScript.ContractGenerator" Version="2.0.131" />
   </ItemGroup>
 

diff --git a/Cassandra.DistributedTaskQueue.Monitoring/Api/RtqMonitoringSearchRequest.cs b/Cassandra.DistributedTaskQueue.Monitoring/Api/RtqMonitoringSearchRequest.cs
@@ -1,4 +1,6 @@
-using System.Text.Json.Serialization;
+#nullable enable
+
+using System.Text.Json.Serialization;
 
 using SkbKontur.Cassandra.DistributedTaskQueue.Cassandra.Entities;
 
@@ -9,14 +11,12 @@ public class RtqMonitoringSearchRequest
     [JsonPropertyName("enqueueTimestampRange")]
     public TimestampRange EnqueueTimestampRange { get; set; }
 
-#nullable enable
     [JsonPropertyName("queryString")]
     public string? QueryString { get; set; }
 
     [JsonPropertyName("states")]
     public TaskState[]? States { get; set; }
 
-#nullable disable
     [JsonPropertyName("names")]
     public string[] Names { get; set; }
 

diff --git a/Cassandra.DistributedTaskQueue.Monitoring/Api/RtqMonitoringSearchResults.cs b/Cassandra.DistributedTaskQueue.Monitoring/Api/RtqMonitoringSearchResults.cs
@@ -7,7 +7,6 @@ public class RtqMonitoringSearchResults
     [JsonPropertyName("totalCount")]
     public long TotalCount { get; set; }
 
-#nullable disable
     [JsonPropertyName("taskMetas")]
     public RtqMonitoringTaskMeta[] TaskMetas { get; set; }
 }
diff --git a/Cassandra.DistributedTaskQueue.Monitoring/Api/RtqMonitoringTaskMeta.cs b/Cassandra.DistributedTaskQueue.Monitoring/Api/RtqMonitoringTaskMeta.cs
@@ -1,6 +1,4 @@
-#nullable disable
-
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 using SkbKontur.Cassandra.DistributedTaskQueue.Cassandra.Entities;
 using SkbKontur.Cassandra.DistributedTaskQueue.Monitoring.Json;

diff --git a/Cassandra.DistributedTaskQueue.Monitoring/Api/RtqMonitoringTaskModel.cs b/Cassandra.DistributedTaskQueue.Monitoring/Api/RtqMonitoringTaskModel.cs
@@ -1,6 +1,4 @@
-#nullable disable
-
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 using SkbKontur.Cassandra.DistributedTaskQueue.Handling;
 using SkbKontur.Cassandra.DistributedTaskQueue.Monitoring.Json;

diff --git a/Cassandra.DistributedTaskQueue.Monitoring/Api/TimestampRange.cs b/Cassandra.DistributedTaskQueue.Monitoring/Api/TimestampRange.cs
@@ -1,6 +1,4 @@
-#nullable disable
-
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 using SkbKontur.Cassandra.DistributedTaskQueue.Monitoring.Json;
 using SkbKontur.Cassandra.TimeBasedUuid;

diff --git a/Cassandra.DistributedTaskQueue.Monitoring/Cassandra.DistributedTaskQueue.Monitoring.csproj b/Cassandra.DistributedTaskQueue.Monitoring/Cassandra.DistributedTaskQueue.Monitoring.csproj
@@ -10,7 +10,6 @@
   <ItemGroup>
     <PackageReference Include="Elasticsearch.Net" Version="7.17.5" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="SkbKontur.EventFeeds" Version="1.1.3" />
     <PackageReference Include="System.Text.Json" Version="9.0.0-rc.2.24473.5" />
   </ItemGroup>

diff --git a/...kQueue.Monitoring/ElasticsearchClientExtensions/ElasticsearchResponseWrapperExtensions.cs b/...kQueue.Monitoring/ElasticsearchClientExtensions/ElasticsearchResponseWrapperExtensions.cs
@@ -1,6 +1,4 @@
-#nullable disable
-
-using System;
+using System;
 using System.Linq;
 using System.Text;
 using System.Text.Json;

diff --git a/...utedTaskQueue.Monitoring/ElasticsearchClientExtensions/Responses/Search/HitsCollection.cs b/...utedTaskQueue.Monitoring/ElasticsearchClientExtensions/Responses/Search/HitsCollection.cs
@@ -1,6 +1,4 @@
-#nullable disable
-
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 using SkbKontur.Cassandra.DistributedTaskQueue.Monitoring.Json;
 

diff --git a/Cassandra.DistributedTaskQueue.Monitoring/Indexer/RtqElasticsearchIndexerSettings.cs b/Cassandra.DistributedTaskQueue.Monitoring/Indexer/RtqElasticsearchIndexerSettings.cs
@@ -1,6 +1,4 @@
-#nullable disable
-
-using System;
+using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 

diff --git a/Cassandra.DistributedTaskQueue.Monitoring/Indexer/TaskMetaProcessor.cs b/Cassandra.DistributedTaskQueue.Monitoring/Indexer/TaskMetaProcessor.cs
@@ -1,6 +1,4 @@
-#nullable disable
-
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;

diff --git a/Cassandra.DistributedTaskQueue.Monitoring/Json/JsonObjectExtensions.cs b/Cassandra.DistributedTaskQueue.Monitoring/Json/JsonObjectExtensions.cs
@@ -1,6 +1,4 @@
-#nullable disable
-
-using System.Text.Json;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace SkbKontur.Cassandra.DistributedTaskQueue.Monitoring.Json;

diff --git a/Cassandra.DistributedTaskQueue.Monitoring/Storage/Client/TaskSearchClient.cs b/Cassandra.DistributedTaskQueue.Monitoring/Storage/Client/TaskSearchClient.cs
@@ -1,6 +1,4 @@
-#nullable disable
-
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
 

diff --git a/Cassandra.DistributedTaskQueue.Monitoring/Storage/Writing/RtqElasticsearchOffsetStorage.cs b/Cassandra.DistributedTaskQueue.Monitoring/Storage/Writing/RtqElasticsearchOffsetStorage.cs
@@ -1,6 +1,4 @@
-#nullable disable
-
-using System;
+using System;
 using System.Text.Json;
 
 using Elasticsearch.Net;

diff --git a/Cassandra.DistributedTaskQueue.Monitoring/TaskCounter/RtqTaskCounters.cs b/Cassandra.DistributedTaskQueue.Monitoring/TaskCounter/RtqTaskCounters.cs
@@ -1,23 +1,22 @@
-using System.Collections.Generic;
+#nullable enable
+
+using System.Collections.Generic;
 using System.Linq;
 
 using SkbKontur.Cassandra.DistributedTaskQueue.Cassandra.Entities;
 
-#nullable enable
+namespace SkbKontur.Cassandra.DistributedTaskQueue.Monitoring.TaskCounter;
 
-namespace SkbKontur.Cassandra.DistributedTaskQueue.Monitoring.TaskCounter
+public class RtqTaskCounters
 {
-    public class RtqTaskCounters
-    {
-        public int LostTasksCount { get; set; }
+    public int LostTasksCount { get; set; }
 
-        public Dictionary<TaskState, int> PendingTaskCountsTotal { get; set; } = null!;
+    public Dictionary<TaskState, int> PendingTaskCountsTotal { get; set; } = null!;
 
-        public Dictionary<(string TaskName, string TaskTopic), Dictionary<TaskState, int>> PendingTaskCountsByNameAndTopic { get; set; } = null!;
+    public Dictionary<(string TaskName, string TaskTopic), Dictionary<TaskState, int>> PendingTaskCountsByNameAndTopic { get; set; } = null!;
 
-        public int GetPendingTaskTotalCount()
-        {
-            return PendingTaskCountsTotal.Values.Sum();
-        }
+    public int GetPendingTaskTotalCount()
+    {
+        return PendingTaskCountsTotal.Values.Sum();
     }
 }
diff --git a/...edTaskQueue.TestExchangeService/Cassandra.DistributedTaskQueue.TestExchangeService.csproj b/...edTaskQueue.TestExchangeService/Cassandra.DistributedTaskQueue.TestExchangeService.csproj
@@ -8,10 +8,6 @@
     <OutputPath>bin\</OutputPath>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.16" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Cassandra.DistributedTaskQueue.FunctionalTests.Common\Cassandra.DistributedTaskQueue.FunctionalTests.Common.csproj" />
   </ItemGroup>

diff --git a/Cassandra.DistributedTaskQueue.TestExchangeService/Startup.cs b/Cassandra.DistributedTaskQueue.TestExchangeService/Startup.cs
@@ -4,23 +4,22 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
-namespace SkbKontur.Cassandra.DistributedTaskQueue.TestExchangeService
+namespace SkbKontur.Cassandra.DistributedTaskQueue.TestExchangeService;
+
+public class Startup
 {
-    public class Startup
+    public void ConfigureServices(IServiceCollection services)
     {
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddControllers().AddNewtonsoftJson();
-            services.AddSingleton<IControllerFactory>(new GroboControllerFactory());
-        }
+        services.AddControllers();
+        services.AddSingleton<IControllerFactory>(new GroboControllerFactory());
+    }
 
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            if (env.IsDevelopment())
-                app.UseDeveloperExceptionPage();
+    public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
+    {
+        if (env.IsDevelopment())
+            app.UseDeveloperExceptionPage();
 
-            app.UseRouting();
-            app.UseEndpoints(endpoints => endpoints.MapControllers());
-        }
+        app.UseRouting();
+        app.UseEndpoints(endpoints => endpoints.MapControllers());
     }
 }
diff --git a/Cassandra.DistributedTaskQueue.Tests/HttpClientForTestsBase.cs b/Cassandra.DistributedTaskQueue.Tests/HttpClientForTestsBase.cs
@@ -1,6 +1,4 @@
-#nullable disable
-
-using System;
+using System;
 using System.Text;
 using System.Text.Json;
 

diff --git a/Cassandra.DistributedTaskQueue.Tests/RtqTaskCountersForTests.cs b/Cassandra.DistributedTaskQueue.Tests/RtqTaskCountersForTests.cs
@@ -1,21 +1,20 @@
+#nullable enable
+
 using System.Collections.Generic;
 using System.Linq;
 
 using SkbKontur.Cassandra.DistributedTaskQueue.Cassandra.Entities;
 
-#nullable enable
+namespace SkbKontur.Cassandra.DistributedTaskQueue.Tests;
 
-namespace SkbKontur.Cassandra.DistributedTaskQueue.Tests
+public class RtqTaskCountersForTests
 {
-    public class RtqTaskCountersForTests
-    {
-        public int LostTasksCount { get; set; }
+    public int LostTasksCount { get; set; }
 
-        public Dictionary<TaskState, int> PendingTaskCountsTotal { get; set; } = null!;
+    public Dictionary<TaskState, int> PendingTaskCountsTotal { get; set; } = null!;
 
-        public int GetPendingTaskTotalCount()
-        {
-            return PendingTaskCountsTotal.Values.Sum();
-        }
+    public int GetPendingTaskTotalCount()
+    {
+        return PendingTaskCountsTotal.Values.Sum();
     }
 }
diff --git a/Cassandra.DistributedTaskQueue/Configuration/IRtqTaskDataRegistry.cs b/Cassandra.DistributedTaskQueue/Configuration/IRtqTaskDataRegistry.cs
@@ -1,23 +1,22 @@
-using System;
+#nullable enable
 
-#nullable enable
+using System;
 
-namespace SkbKontur.Cassandra.DistributedTaskQueue.Configuration
+namespace SkbKontur.Cassandra.DistributedTaskQueue.Configuration;
+
+public interface IRtqTaskDataRegistry
 {
-    public interface IRtqTaskDataRegistry
-    {
-        string[] GetAllTaskNames();
+    string[] GetAllTaskNames();
 
-        string GetTaskName(Type type);
+    string GetTaskName(Type type);
 
-        Type GetTaskType(string taskName);
+    Type GetTaskType(string taskName);
 
-        bool TryGetTaskType(string taskName, out Type? taskType);
+    bool TryGetTaskType(string taskName, out Type? taskType);
 
-        string[] GetAllTaskTopics();
+    string[] GetAllTaskTopics();
 
-        (string TaskName, string TopicName)[] GetAllTaskNamesWithTopics();
+    (string TaskName, string TopicName)[] GetAllTaskNamesWithTopics();
 
-        string GetTaskTopic(string taskName);
-    }
+    string GetTaskTopic(string taskName);
 }