Merge pull request #743 from dlcs/feature/cleanup_usings

Optimise using directives via Rider
dlcs · Feb 21, 2024 · 1871786 · 1871786
2 parents 4123af2 + 91633e0
commit 1871786
Show file tree

Hide file tree

Showing 161 changed files with 72 additions and 332 deletions.
diff --git a/src/protagonist/API.Client/AdminDlcsClient.cs b/src/protagonist/API.Client/AdminDlcsClient.cs
@@ -2,15 +2,15 @@
 using System.Net.Http.Headers;
 using System.Text;
 using System.Threading.Tasks;
+using DLCS.HydraModel;
 using DLCS.Web.Response;
+using Hydra;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
-using DLCS.HydraModel;
-using Hydra;
 
 namespace API.Client;
-
+
 public class AdminDlcsClient
 {
     private readonly ILogger<AdminDlcsClient> logger;

diff --git a/src/protagonist/API.Client/DlcsClient.cs b/src/protagonist/API.Client/DlcsClient.cs
@@ -8,7 +8,6 @@
 using System.Threading.Tasks;
 using DLCS.HydraModel;
 using DLCS.Web.Auth;
-using DLCS.Web.Response;
 using Hydra;
 using Hydra.Collections;
 using Microsoft.Extensions.Logging;

diff --git a/src/protagonist/API.Client/HydraHttpResponseMessageX.cs b/src/protagonist/API.Client/HydraHttpResponseMessageX.cs
@@ -1,14 +1,13 @@
 using System;
 using System.Net.Http;
 using System.Threading.Tasks;
-using DLCS.Core.Collections;
 using DLCS.Web.Response;
 using Hydra;
 using Hydra.Model;
 using Newtonsoft.Json;
 
 namespace API.Client;
-
+
 /// <summary>
 /// Rather than just using Newtonsoft ReadAsJsonAsync directly, we wrap the deserialisation
 /// to ensure a correct Hydra object with @context is created, or a DlcsException is thrown.

diff --git a/src/protagonist/API.Tests/Features/CustomHeaders/Validation/HydraCustomHeaderValidator.cs b/src/protagonist/API.Tests/Features/CustomHeaders/Validation/HydraCustomHeaderValidator.cs
@@ -1,6 +1,5 @@
 using System;
 using API.Features.CustomHeaders.Validation;
-using API.Features.CustomHeaders.Converters;
 using DLCS.HydraModel;
 using FluentValidation.TestHelper;
 

diff --git a/src/protagonist/API.Tests/Features/Images/Ingest/AssetProcessorTest.cs b/src/protagonist/API.Tests/Features/Images/Ingest/AssetProcessorTest.cs
@@ -3,13 +3,11 @@
 using API.Features.Assets;
 using API.Features.Image.Ingest;
 using API.Settings;
-using DLCS.Core.Settings;
 using DLCS.Core.Types;
 using DLCS.Model.Assets;
 using DLCS.Model.Policies;
 using DLCS.Model.Storage;
 using FakeItEasy;
-using Microsoft.Extensions.Options;
 using Test.Helpers.Settings;
 
 namespace API.Tests.Features.Images.Ingest;

diff --git a/src/protagonist/API.Tests/Features/Queues/Validation/QueuePostValidatorTests.cs b/src/protagonist/API.Tests/Features/Queues/Validation/QueuePostValidatorTests.cs
@@ -2,11 +2,9 @@
 using API.Features.Queues.Validation;
 using API.Settings;
 using DLCS.HydraModel;
-using DLCS.Model.Assets;
 using FluentValidation.TestHelper;
 using Hydra.Collections;
 using Microsoft.Extensions.Options;
-using AssetFamily = DLCS.HydraModel.AssetFamily;
 
 namespace API.Tests.Features.Queues.Validation;
 

diff --git a/src/protagonist/API.Tests/Integration/CustomHeaderTests.cs b/src/protagonist/API.Tests/Integration/CustomHeaderTests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.Http;

diff --git a/src/protagonist/API.Tests/Integration/CustomerPolicyTests.cs b/src/protagonist/API.Tests/Integration/CustomerPolicyTests.cs
@@ -4,7 +4,6 @@
 using API.Client;
 using API.Tests.Integration.Infrastructure;
 using DLCS.HydraModel;
-using DLCS.Repository;
 using Hydra.Collections;
 using Test.Helpers.Integration;
 using Test.Helpers.Integration.Infrastructure;

diff --git a/src/protagonist/API.Tests/Integration/CustomerQueueTests.cs b/src/protagonist/API.Tests/Integration/CustomerQueueTests.cs
@@ -10,7 +10,6 @@
 using API.Client;
 using API.Tests.Integration.Infrastructure;
 using DLCS.Core.Types;
-using DLCS.Model.Assets;
 using DLCS.Model.Messaging;
 using DLCS.Repository;
 using DLCS.Repository.Messaging;

diff --git a/src/protagonist/API.Tests/Integration/GetAssetTests.cs b/src/protagonist/API.Tests/Integration/GetAssetTests.cs
@@ -1,34 +1,21 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
-using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 using API.Client;
 using API.Tests.Integration.Infrastructure;
-using DLCS.AWS.S3;
-using DLCS.AWS.S3.Models;
 using DLCS.Core.Types;
 using DLCS.HydraModel;
-using DLCS.Model.Messaging;
 using DLCS.Repository;
-using DLCS.Repository.Messaging;
-using FakeItEasy;
-using FluentAssertions;
 using Hydra.Collections;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Mvc.Testing;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
-using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Test.Helpers.Integration;
 using Test.Helpers.Integration.Infrastructure;
-using Xunit;
-using AssetFamily = DLCS.Model.Assets.AssetFamily;
 
 namespace API.Tests.Integration;
 

diff --git a/src/protagonist/API.Tests/Integration/Infrastructure/CollectionDefinitions.cs b/src/protagonist/API.Tests/Integration/Infrastructure/CollectionDefinitions.cs
@@ -1,5 +1,4 @@
 using Test.Helpers.Integration;
-using Xunit;
 
 namespace API.Tests.Integration.Infrastructure;
 

diff --git a/src/protagonist/API.Tests/Integration/PolicyTests.cs b/src/protagonist/API.Tests/Integration/PolicyTests.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
+using System.Net;
 using System.Net.Http;
-using System.Text.Json;
 using System.Threading.Tasks;
 using API.Client;
 using API.Tests.Integration.Infrastructure;

diff --git a/src/protagonist/API.Tests/Integration/StorageTests.cs b/src/protagonist/API.Tests/Integration/StorageTests.cs
@@ -5,7 +5,6 @@
 using API.Tests.Integration.Infrastructure;
 using DLCS.Core.Types;
 using DLCS.Model.Assets;
-using DLCS.Model.Spaces;
 using DLCS.Model.Storage;
 using DLCS.Repository;
 using Test.Helpers.Integration;

diff --git a/src/protagonist/API.Tests/Integration/UsersAndKeysTests.cs b/src/protagonist/API.Tests/Integration/UsersAndKeysTests.cs
@@ -7,13 +7,11 @@
 using DLCS.Core.Strings;
 using DLCS.HydraModel;
 using DLCS.Repository;
-using FluentAssertions;
 using Hydra;
 using Hydra.Collections;
 using Microsoft.EntityFrameworkCore;
 using Test.Helpers.Integration;
 using Test.Helpers.Integration.Infrastructure;
-using Xunit;
 
 namespace API.Tests.Integration;
 

diff --git a/src/protagonist/API.Tests/JsonLd/ApiKeyTests.cs b/src/protagonist/API.Tests/JsonLd/ApiKeyTests.cs
@@ -1,6 +1,4 @@
 using DLCS.HydraModel;
-using FluentAssertions;
-using Xunit;
 
 namespace API.Tests.JsonLd;
 

diff --git a/src/protagonist/API/Exceptions/APIException.cs b/src/protagonist/API/Exceptions/APIException.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Runtime.Serialization;
 
 namespace API.Exceptions;

diff --git a/src/protagonist/API/Features/CustomHeaders/Requests/CreateCustomHeader.cs b/src/protagonist/API/Features/CustomHeaders/Requests/CreateCustomHeader.cs
@@ -3,7 +3,6 @@
 using DLCS.Model.Assets.CustomHeaders;
 using DLCS.Repository;
 using MediatR;
-using Microsoft.EntityFrameworkCore;
 
 namespace API.Features.CustomHeaders.Requests;
 

diff --git a/src/protagonist/API/Features/CustomHeaders/Requests/DeleteCustomHeader.cs b/src/protagonist/API/Features/CustomHeaders/Requests/DeleteCustomHeader.cs
@@ -1,6 +1,4 @@
-using API.Infrastructure.Requests;
-using DLCS.Core;
-using DLCS.Model.Messaging;
+using DLCS.Core;
 using DLCS.Repository;
 using MediatR;
 using Microsoft.EntityFrameworkCore;

diff --git a/src/protagonist/API/Features/CustomHeaders/Requests/GetCustomHeader.cs b/src/protagonist/API/Features/CustomHeaders/Requests/GetCustomHeader.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using API.Infrastructure.Requests;
+using API.Infrastructure.Requests;
 using DLCS.Model.Assets.CustomHeaders;
 using DLCS.Repository;
 using MediatR;

diff --git a/src/protagonist/API/Features/CustomHeaders/Validation/HydraCustomHeaderValidator.cs b/src/protagonist/API/Features/CustomHeaders/Validation/HydraCustomHeaderValidator.cs
@@ -1,6 +1,6 @@
  using FluentValidation;
 
-namespace API.Features.CustomHeaders.Validation;
+ namespace API.Features.CustomHeaders.Validation;
 
 
 public class HydraCustomHeaderValidator : AbstractValidator<DLCS.HydraModel.CustomHeader>

diff --git a/src/protagonist/API/Features/Customer/Requests/CreateCustomer.cs b/src/protagonist/API/Features/Customer/Requests/CreateCustomer.cs
@@ -2,8 +2,6 @@
 using System.Data;
 using DLCS.Model;
 using DLCS.Model.Auth;
-using DLCS.Model.DeliveryChannels;
-using DLCS.Model.Policies;
 using DLCS.Model.Processing;
 using DLCS.Repository;
 using DLCS.Repository.Entities;

diff --git a/src/protagonist/API/Features/NamedQueries/Converters/NamedQueryConverter.cs b/src/protagonist/API/Features/NamedQueries/Converters/NamedQueryConverter.cs
@@ -1,6 +1,4 @@
-using API.Exceptions;
-
-namespace API.Features.NamedQueries.Converters;
+namespace API.Features.NamedQueries.Converters;
 
 public static class NamedQueryConverter
 {

diff --git a/src/protagonist/API/Features/NamedQueries/NamedQueriesController.cs b/src/protagonist/API/Features/NamedQueries/NamedQueriesController.cs
@@ -1,9 +1,7 @@
-using System.Text.Json;
-using API.Features.NamedQueries.Converters;
+using API.Features.NamedQueries.Converters;
 using API.Features.NamedQueries.Requests;
 using API.Infrastructure;
 using API.Settings;
-using DLCS.Core.Collections;
 using DLCS.HydraModel;
 using DLCS.Web.Auth;
 using FluentValidation;

diff --git a/src/protagonist/API/Features/NamedQueries/Requests/DeleteNamedQuery.cs b/src/protagonist/API/Features/NamedQueries/Requests/DeleteNamedQuery.cs
@@ -1,6 +1,4 @@
-using API.Infrastructure.Requests;
-using DLCS.Core;
-using DLCS.Model.Messaging;
+using DLCS.Core;
 using DLCS.Repository;
 using MediatR;
 using Microsoft.EntityFrameworkCore;

diff --git a/src/protagonist/API/Features/NamedQueries/Requests/GetNamedQuery.cs b/src/protagonist/API/Features/NamedQueries/Requests/GetNamedQuery.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using API.Infrastructure.Requests;
+using API.Infrastructure.Requests;
 using DLCS.Model.Assets.NamedQueries;
 using DLCS.Repository;
 using MediatR;

diff --git a/src/protagonist/API/Features/OriginStrategies/Credentials/CredentialsExporter.cs b/src/protagonist/API/Features/OriginStrategies/Credentials/CredentialsExporter.cs
@@ -1,5 +1,4 @@
 using System.Text.Json;
-using API.Features.OriginStrategies.Requests;
 using DLCS.AWS.S3;
 using DLCS.AWS.S3.Models;
 using DLCS.Model.Auth;

diff --git a/src/protagonist/API/Features/OriginStrategies/Requests/CreateCustomerOriginStrategy.cs b/src/protagonist/API/Features/OriginStrategies/Requests/CreateCustomerOriginStrategy.cs
@@ -1,10 +1,7 @@
 using System.Text.Json;
 using API.Features.OriginStrategies.Credentials;
 using API.Infrastructure.Requests;
-using DLCS.AWS.S3;
-using DLCS.AWS.S3.Models;
 using DLCS.Core;
-using DLCS.Model.Auth;
 using DLCS.Model.Customers;
 using DLCS.Repository;
 using MediatR;

diff --git a/src/protagonist/API/Features/OriginStrategies/Requests/DeleteCustomerOriginStrategy.cs b/src/protagonist/API/Features/OriginStrategies/Requests/DeleteCustomerOriginStrategy.cs
@@ -1,8 +1,5 @@
 using API.Features.OriginStrategies.Credentials;
-using DLCS.AWS.S3;
-using DLCS.AWS.S3.Models;
 using DLCS.Core;
-using DLCS.Model.Customers;
 using DLCS.Repository;
 using MediatR;
 using Microsoft.EntityFrameworkCore;

diff --git a/src/protagonist/API/Features/OriginStrategies/Requests/UpdateCustomerOriginStrategy.cs b/src/protagonist/API/Features/OriginStrategies/Requests/UpdateCustomerOriginStrategy.cs
@@ -1,12 +1,12 @@
-using API.Infrastructure.Requests;
+using API.Features.OriginStrategies.Credentials;
+using API.Infrastructure.Requests;
 using DLCS.Core;
+using DLCS.Core.Enum;
+using DLCS.Core.Strings;
 using DLCS.Model.Customers;
 using DLCS.Repository;
 using MediatR;
 using Microsoft.EntityFrameworkCore;
-using API.Features.OriginStrategies.Credentials;
-using DLCS.Core.Enum;
-using DLCS.Core.Strings;
 
 namespace API.Features.OriginStrategies.Requests;
 

diff --git a/src/protagonist/API/Features/Policies/CustomerPolicyController.cs b/src/protagonist/API/Features/Policies/CustomerPolicyController.cs
@@ -4,7 +4,6 @@
 using API.Settings;
 using DLCS.HydraModel;
 using MediatR;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;

diff --git a/src/protagonist/API/Features/Queues/Validation/QueuePostValidator.cs b/src/protagonist/API/Features/Queues/Validation/QueuePostValidator.cs
@@ -1,5 +1,4 @@
-using API.Converters;
-using API.Features.Image.Validation;
+using API.Features.Image.Validation;
 using API.Settings;
 using DLCS.Core.Collections;
 using FluentValidation;

diff --git a/src/protagonist/API/Features/Space/Requests/DeleteSpace.cs b/src/protagonist/API/Features/Space/Requests/DeleteSpace.cs
@@ -1,6 +1,4 @@
-using API.Infrastructure.Requests;
-using DLCS.Core;
-using DLCS.Model.Messaging;
+using DLCS.Core;
 using DLCS.Model.Spaces;
 using MediatR;
 using Microsoft.Extensions.Logging;

diff --git a/src/protagonist/API/Features/Space/Requests/PatchSpace.cs b/src/protagonist/API/Features/Space/Requests/PatchSpace.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using System.Net;
 using API.Infrastructure.Requests;
 using DLCS.Core;
 using DLCS.Core.Strings;

diff --git a/src/protagonist/API/Features/Space/Requests/PutSpace.cs b/src/protagonist/API/Features/Space/Requests/PutSpace.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using API.Infrastructure.Requests;
+using API.Infrastructure.Requests;
 using DLCS.Core;
 using DLCS.Core.Strings;
 using DLCS.Model.Spaces;

diff --git a/src/protagonist/API/Infrastructure/ServiceCollectionX.cs b/src/protagonist/API/Infrastructure/ServiceCollectionX.cs
@@ -2,7 +2,6 @@
 using System.Reflection;
 using API.Features.Assets;
 using API.Features.Customer;
-using API.Features.Customer.Requests;
 using DLCS.AWS.Configuration;
 using DLCS.AWS.ElasticTranscoder;
 using DLCS.AWS.S3;

diff --git a/src/protagonist/API/Program.cs b/src/protagonist/API/Program.cs
@@ -1,7 +1,7 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
 using DLCS.AWS.SSM;
 using DLCS.Web.Logging;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Hosting;
 using Serilog;
 
 namespace API;

diff --git a/src/protagonist/DLCS.AWS.Tests/LocalStackCollection.cs b/src/protagonist/DLCS.AWS.Tests/LocalStackCollection.cs
@@ -1,5 +1,4 @@
 using Test.Helpers.Integration;
-using Xunit;
 
 namespace DLCS.AWS.Tests;
 

diff --git a/src/protagonist/DLCS.AWS.Tests/S3/Models/ObjectInBucketXTests.cs b/src/protagonist/DLCS.AWS.Tests/S3/Models/ObjectInBucketXTests.cs
@@ -1,5 +1,5 @@
 using DLCS.AWS.S3.Models;
- 
+
 namespace DLCS.AWS.Tests.S3.Models;
 
 public class ObjectInBucketXTests

diff --git a/src/protagonist/DLCS.Core.Tests/ChangeManagerTests.cs b/src/protagonist/DLCS.Core.Tests/ChangeManagerTests.cs
@@ -1,7 +1,5 @@
 using System;
 using System.Collections.Generic;
-using FluentAssertions;
-using Xunit;
 
 namespace DLCS.Core.Tests;
 

diff --git a/src/protagonist/DLCS.Core.Tests/Collections/CollectionXTests.cs b/src/protagonist/DLCS.Core.Tests/Collections/CollectionXTests.cs
@@ -2,8 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using DLCS.Core.Collections;
-using FluentAssertions;
-using Xunit;
 
 namespace DLCS.Core.Tests.Collections;
 

diff --git a/src/protagonist/DLCS.Core.Tests/Collections/ReadOnlyMapTests.cs b/src/protagonist/DLCS.Core.Tests/Collections/ReadOnlyMapTests.cs
@@ -1,8 +1,6 @@
 using System;
 using System.Collections.Generic;
 using DLCS.Core.Collections;
-using FluentAssertions;
-using Xunit;
 
 namespace DLCS.Core.Tests.Collections;