Removed unused using and reorganized using inside Catalog.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;