1. remove unused using, 2. Reorganized the using, 3. Moved the class into separate file and 4. Added line and spacing formats (#1532)

* Removed Unused Using and Reorganized the Using

* Removed unused using, Reorganized using, moved the class to separate file, removed commented code in Catalog.API

* Revert "Removed unused using, Reorganized using, moved the class to separate file, removed commented code in Catalog.API"

This reverts commit 34241c430619b3b0bbeaabafa44c078c859237c4.

* Removed unused using and reorganized the using inside "Services" folder

* Removed Unused using and reoganized the using

* Refactor Webhooks.API

* Removed unused using and reorganized using inside Catalog.API

src/Services/Basket/Basket.API/Auth/Server/AuthorizationHeaderParameterOperationFilter.cs

@@ -1,6 +1,5 @@
 using Microsoft.AspNetCore.Mvc.Authorization;
 using Microsoft.OpenApi.Models;
-using Swashbuckle.AspNetCore.Swagger;
 using Swashbuckle.AspNetCore.SwaggerGen;
 using System.Collections.Generic;
 using System.Linq;

src/Services/Basket/Basket.API/Controllers/BasketController.cs

@@ -7,7 +7,6 @@ using Microsoft.eShopOnContainers.Services.Basket.API.Model;
 using Microsoft.eShopOnContainers.Services.Basket.API.Services;
 using Microsoft.Extensions.Logging;
 using System;
-using System.Linq;
 using System.Net;
 using System.Security.Claims;
 using System.Threading.Tasks;

src/Services/Basket/Basket.API/Grpc/BasketService.cs

@@ -4,7 +4,6 @@ using Microsoft.eShopOnContainers.Services.Basket.API.Model;
 using Microsoft.Extensions.Logging;
 using System.Linq;
 using System.Threading.Tasks;
-using GrpcBasket;
 
 namespace GrpcBasket
 {

src/Services/Basket/Basket.API/Infrastructure/Middlewares/ByPassAuthMiddleware.cs

@@ -1,7 +1,6 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Primitives;
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Security.Claims;
 using System.Threading.Tasks;

src/Services/Basket/Basket.API/Startup.cs

@@ -4,6 +4,7 @@ using Basket.API.Infrastructure.Filters;
 using Basket.API.Infrastructure.Middlewares;
 using Basket.API.IntegrationEvents.EventHandling;
 using Basket.API.IntegrationEvents.Events;
+using GrpcBasket;
 using HealthChecks.UI.Client;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Builder;
@@ -33,9 +34,6 @@ using System;
 using System.Collections.Generic;
 using System.IdentityModel.Tokens.Jwt;
 using System.IO;
-using GrpcBasket;
-using Microsoft.AspNetCore.Http.Features;
-using Serilog;
 
 namespace Microsoft.eShopOnContainers.Services.Basket.API
 {

src/Services/Catalog/Catalog.API/Extensions/CatalogItemExtensions.cs

@@ -1,9 +1,4 @@
-using System;
+namespace Microsoft.eShopOnContainers.Services.Catalog.API.Model
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Microsoft.eShopOnContainers.Services.Catalog.API.Model
 {
     public static class CatalogItemExtensions
     {

src/Services/Catalog/Catalog.API/Extensions/HostExtensions.cs

@@ -1,13 +1,10 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Hosting;
-using System;
 using Microsoft.Extensions.DependencyInjection;
-using System.Collections.Generic;
+using Microsoft.Extensions.Hosting;
-using System.Linq;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using Polly;
+using System;
 using System.Data.SqlClient;
 
 namespace Catalog.API.Extensions

src/Services/Catalog/Catalog.API/Extensions/WebHostExtensions.cs

@@ -1,11 +1,11 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
-using System;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Polly;
+using System;
 using System.Data.SqlClient;
-using Microsoft.AspNetCore.Hosting;
 
 namespace Catalog.API.Extensions
 {

src/Services/Catalog/Catalog.API/Grpc/CatalogService.cs

@@ -1,16 +1,15 @@
-using System;
+using CatalogApi;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using CatalogApi;
 using Grpc.Core;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.eShopOnContainers.Services.Catalog.API;
 using Microsoft.eShopOnContainers.Services.Catalog.API.Infrastructure;
 using Microsoft.eShopOnContainers.Services.Catalog.API.Model;
-using Microsoft.eShopOnContainers.Services.Catalog.API.ViewModel;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using static CatalogApi.Catalog;
 
 namespace Catalog.API.Grpc

src/Services/Catalog/Catalog.API/Infrastructure/CatalogContext.cs

@@ -1,9 +1,9 @@
 namespace Microsoft.eShopOnContainers.Services.Catalog.API.Infrastructure
 {
-    using Microsoft.EntityFrameworkCore;
     using EntityConfigurations;
-    using Model;
+    using Microsoft.EntityFrameworkCore;
     using Microsoft.EntityFrameworkCore.Design;
+    using Model;
 
     public class CatalogContext : DbContext
     {

src/Services/Catalog/Catalog.API/IntegrationEvents/CatalogIntegrationEventService.cs

@@ -1,5 +1,4 @@
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
 using Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF.Services;
@@ -7,7 +6,6 @@ using Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF.Utilities
 using Microsoft.eShopOnContainers.Services.Catalog.API;
 using Microsoft.eShopOnContainers.Services.Catalog.API.Infrastructure;
 using Microsoft.Extensions.Logging;
-using Serilog.Context;
 using System;
 using System.Data.Common;
 using System.Threading.Tasks;

src/Services/Catalog/Catalog.API/IntegrationEvents/EventHandling/OrderStatusChangedToAwaitingValidationIntegrationEventHandler.cs

@@ -1,15 +1,15 @@
 namespace Microsoft.eShopOnContainers.Services.Catalog.API.IntegrationEvents.EventHandling
 {
     using BuildingBlocks.EventBus.Abstractions;
-    using System.Threading.Tasks;
     using BuildingBlocks.EventBus.Events;
+    using global::Catalog.API.IntegrationEvents;
     using Infrastructure;
+    using IntegrationEvents.Events;
+    using Microsoft.Extensions.Logging;
+    using Serilog.Context;
     using System.Collections.Generic;
     using System.Linq;
-    using global::Catalog.API.IntegrationEvents;
+    using System.Threading.Tasks;
-    using IntegrationEvents.Events;
-    using Serilog.Context;
-    using Microsoft.Extensions.Logging;
 
     public class OrderStatusChangedToAwaitingValidationIntegrationEventHandler : 
         IIntegrationEventHandler<OrderStatusChangedToAwaitingValidationIntegrationEvent>

src/Services/Catalog/Catalog.API/IntegrationEvents/EventHandling/OrderStatusChangedToPaidIntegrationEventHandler.cs

@@ -1,11 +1,11 @@
 namespace Microsoft.eShopOnContainers.Services.Catalog.API.IntegrationEvents.EventHandling
 {
     using BuildingBlocks.EventBus.Abstractions;
-    using System.Threading.Tasks;
     using Infrastructure;
     using Microsoft.eShopOnContainers.Services.Catalog.API.IntegrationEvents.Events;
     using Microsoft.Extensions.Logging;
     using Serilog.Context;
+    using System.Threading.Tasks;
 
     public class OrderStatusChangedToPaidIntegrationEventHandler : 
         IIntegrationEventHandler<OrderStatusChangedToPaidIntegrationEvent>

src/Services/Catalog/Catalog.API/Program.cs

@@ -1,5 +1,4 @@
-using Autofac.Extensions.DependencyInjection;
+using Catalog.API.Extensions;
-using Catalog.API.Extensions;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
@@ -12,9 +11,7 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Serilog;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net;
 
 namespace Microsoft.eShopOnContainers.Services.Catalog.API

src/Services/Catalog/Catalog.API/Startup.cs

@@ -11,7 +11,6 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Azure.ServiceBus;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBus;
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ;

src/Services/Webhooks/Webhooks.API/Exceptions/WebhooksDomainException.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Webhooks.API.Exceptions
 {

src/Services/Webhooks/Webhooks.API/Infrastructure/HttpGlobalExceptionFilter.cs

@@ -4,11 +4,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Threading.Tasks;
 using Webhooks.API.Exceptions;
 using Webhooks.API.Infrastructure.ActionResult;
 

src/Services/Webhooks/Webhooks.API/Infrastructure/WebhooksContext.cs

@@ -1,9 +1,5 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Design;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using Webhooks.API.Model;
 
 namespace Webhooks.API.Infrastructure

src/Services/Webhooks/Webhooks.API/IntegrationEvents/OrderStatusChangedToPaidIntegrationEvent.cs

@@ -1,8 +1,5 @@
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Webhooks.API.IntegrationEvents
 {

src/Services/Webhooks/Webhooks.API/IntegrationEvents/OrderStatusChangedToPaidIntegrationEventHandler.cs

@@ -1,11 +1,9 @@
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
-using System;
+using Microsoft.Extensions.Logging;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Webhooks.API.Model;
 using Webhooks.API.Services;
-using Microsoft.Extensions.Logging;
 
 namespace Webhooks.API.IntegrationEvents
 {

src/Services/Webhooks/Webhooks.API/IntegrationEvents/OrderStatusChangedToShippedIntegrationEvent.cs

@@ -1,8 +1,4 @@
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Webhooks.API.IntegrationEvents
 {

src/Services/Webhooks/Webhooks.API/IntegrationEvents/OrderStatusChangedToShippedIntegrationEventHandler.cs

@@ -1,11 +1,9 @@
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
-using System;
+using Microsoft.Extensions.Logging;
-using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Webhooks.API.Model;
 using Webhooks.API.Services;
-using Microsoft.Extensions.Logging;
 
 namespace Webhooks.API.IntegrationEvents
 {

src/Services/Webhooks/Webhooks.API/IntegrationEvents/ProductPriceChangedIntegrationEvent.cs

@@ -1,8 +1,4 @@
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Webhooks.API.IntegrationEvents
 {

src/Services/Webhooks/Webhooks.API/IntegrationEvents/ProductPriceChangedIntegrationEventHandler.cs

@@ -1,7 +1,4 @@
 using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace Webhooks.API.IntegrationEvents

src/Services/Webhooks/Webhooks.API/Model/WebhookData.cs

@@ -1,8 +1,5 @@
 using Newtonsoft.Json;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Webhooks.API.Model
 {

src/Services/Webhooks/Webhooks.API/Model/WebhookSubscription.cs

@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Webhooks.API.Model
 {

src/Services/Webhooks/Webhooks.API/Model/WebhookType.cs

@@ -1,9 +1,4 @@
-using System;
+namespace Webhooks.API.Model
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace Webhooks.API.Model
 {
     public enum WebhookType
     {

src/Services/Webhooks/Webhooks.API/Program.cs

@@ -1,9 +1,4 @@
-using System;
+using Microsoft.AspNetCore;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;

src/Services/Webhooks/Webhooks.API/Services/IGrantUrlTesterService.cs

@@ -1,7 +1,4 @@
-using System;
+using System.Threading.Tasks;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace Webhooks.API.Services
 {

src/Services/Webhooks/Webhooks.API/Services/IWebhooksRetriever.cs

@@ -1,6 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 using Webhooks.API.Model;
 

src/Services/Webhooks/Webhooks.API/Services/WebhooksRetriever.cs

@@ -1,5 +1,4 @@
 using Microsoft.EntityFrameworkCore;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;

src/Tests/Services/Application.FunctionalTests/Extensions/HttpClientExtensions.cs

@@ -1,8 +1,6 @@
 using Microsoft.AspNetCore.TestHost;
 using System;
-using System.Collections.Generic;
 using System.Net.Http;
-using System.Text;
 
 namespace FunctionalTests.Extensions
 {

src/Tests/Services/Application.FunctionalTests/Middleware/AutoAuthorizeMiddleware.cs

@@ -1,8 +1,5 @@
 using Microsoft.AspNetCore.Http;
-using System;
-using System.Collections.Generic;
 using System.Security.Claims;
-using System.Text;
 using System.Threading.Tasks;
 
 namespace FunctionalTests.Middleware

src/Tests/Services/Application.FunctionalTests/Services/Catalog/CatalogScenariosBase.cs

@@ -1,15 +1,14 @@
-using Microsoft.AspNetCore;
+using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.eShopOnContainers.BuildingBlocks.IntegrationEventLogEF;
 using Microsoft.eShopOnContainers.Services.Catalog.API;
 using Microsoft.eShopOnContainers.Services.Catalog.API.Infrastructure;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using System.IO;
 using System.Reflection;
-using Microsoft.Extensions.Configuration;
 
 namespace FunctionalTests.Services.Catalog
 {

src/Tests/Services/Application.FunctionalTests/Services/IntegrationEventsScenarios.cs

@@ -5,13 +5,12 @@ using Microsoft.eShopOnContainers.Services.Catalog.API.Model;
 using Microsoft.eShopOnContainers.Services.Catalog.API.ViewModel;
 using Newtonsoft.Json;
 using System;
-using System.Linq;
 using System.Collections.Generic;
+using System.Linq;
+using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
 using Xunit;
-using System.Net.Http;
-using System.Threading;
 
 namespace FunctionalTests.Services
 {

src/Tests/Services/Application.FunctionalTests/Services/Location/LocationsScenariosBase.cs

@@ -1,6 +1,5 @@
 namespace FunctionalTests.Services.Locations
 {
-    using Microsoft.AspNetCore;
     using Microsoft.AspNetCore.Hosting;
     using Microsoft.AspNetCore.TestHost;
     using Microsoft.Extensions.Configuration;

src/Tests/Services/Application.FunctionalTests/Services/Location/LocationsTestsStartup.cs

@@ -1,7 +1,6 @@
 namespace FunctionalTests.Services.Locations
 {
     using Microsoft.AspNetCore.Builder;
-    using Microsoft.AspNetCore.Hosting;
     using Microsoft.AspNetCore.Http;
     using Microsoft.eShopOnContainers.Services.Locations.API;
     using Microsoft.Extensions.Configuration;

src/Tests/Services/Application.FunctionalTests/Services/Marketing/CampaignScenariosBase.cs

@@ -1,7 +1,5 @@
 namespace FunctionalTests.Services.Marketing
 {
-    using System;
-
     public class CampaignScenariosBase : MarketingScenariosBase
     {
         public static class Get

src/Tests/Services/Application.FunctionalTests/Services/Marketing/MarketingScenarios.cs

@@ -1,17 +1,14 @@
 namespace FunctionalTests.Services.Marketing
 {
-    using UserLocation = Microsoft.eShopOnContainers.Services.Locations.API.Model.UserLocation;
-    using LocationRequest = Microsoft.eShopOnContainers.Services.Locations.API.ViewModel.LocationRequest;
     using FunctionalTests.Services.Locations;
+    using Microsoft.eShopOnContainers.Services.Marketing.API.Dto;
     using Newtonsoft.Json;
-    using System;
+    using System.Collections.Generic;
     using System.Net.Http;
     using System.Text;
     using System.Threading.Tasks;
     using Xunit;
-    using System.Collections.Generic;
+    using LocationRequest = Microsoft.eShopOnContainers.Services.Locations.API.ViewModel.LocationRequest;
-    using Microsoft.eShopOnContainers.Services.Marketing.API.Dto;
-    using Microsoft.eShopOnContainers.Services.Catalog.API.ViewModel;
 
     public class MarketingScenarios : MarketingScenariosBase
     {

src/Tests/Services/Application.FunctionalTests/Services/Marketing/MarketingScenariosBase.cs

@@ -1,12 +1,11 @@
-using Microsoft.AspNetCore;
+using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.eShopOnContainers.Services.Marketing.API.Infrastructure;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using System.IO;
 using System.Reflection;
-using Microsoft.Extensions.Configuration;
 
 namespace FunctionalTests.Services.Marketing
 {

src/Tests/Services/Application.FunctionalTests/Services/Ordering/OrderingTestsStartup.cs

@@ -1,11 +1,7 @@
 using FunctionalTests.Middleware;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
 using Microsoft.eShopOnContainers.Services.Ordering.API;
 using Microsoft.Extensions.Configuration;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace FunctionalTests.Services.Ordering
 {