Moved namespaces to globalusing shopping aggregator

src/ApiGateways/Web.Bff.Shopping/aggregator/Config/UrlsConfig.cs

@@ -1,7 +1,4 @@
-using System.Collections.Generic;
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Config;
-
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Config
-{
 
 public class UrlsConfig
 {
@@ -42,4 +39,3 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Config
     public string GrpcOrdering { get; set; }
 }
 
-}

src/ApiGateways/Web.Bff.Shopping/aggregator/Controllers/BasketController.cs

@@ -1,14 +1,5 @@
-using Microsoft.AspNetCore.Authorization;
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Controllers;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
-using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services;
-using System;
-using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
 
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Controllers
-{
 [Route("api/v1/[controller]")]
 [Authorize]
 [ApiController]
@@ -161,4 +152,3 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Controllers
         return Ok();
     }
 }
-}

src/ApiGateways/Web.Bff.Shopping/aggregator/Controllers/HomeController.cs

@@ -1,7 +1,5 @@
-using Microsoft.AspNetCore.Mvc;
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Controllers;
 
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Controllers
-{
 [Route("")]
 public class HomeController : Controller
 {
@@ -11,4 +9,3 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Controllers
         return new RedirectResult("~/swagger");
     }
 }
-}

src/ApiGateways/Web.Bff.Shopping/aggregator/Controllers/OrderController.cs

@@ -1,12 +1,5 @@
-using Microsoft.AspNetCore.Authorization;
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Controllers;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
-using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services;
-using System.Net;
-using System.Threading.Tasks;
 
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Controllers
-{
 [Route("api/v1/[controller]")]
 [Authorize]
 [ApiController]
@@ -41,4 +34,3 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Controllers
         return await _orderingService.GetOrderDraftAsync(basket);
     }
 }
-}

src/ApiGateways/Web.Bff.Shopping/aggregator/Filters/AuthorizeCheckOperationFilter.cs

@@ -1,10 +1,4 @@
-using Microsoft.AspNetCore.Authorization;
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Filters
-using Microsoft.OpenApi.Models;
-using Swashbuckle.AspNetCore.SwaggerGen;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Filters
 {
     namespace Basket.API.Infrastructure.Filters
     {
@@ -36,4 +30,5 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Filters
             }
         }
     }
+
 }

src/ApiGateways/Web.Bff.Shopping/aggregator/Infrastructure/GrpcExceptionInterceptor.cs

@@ -1,10 +1,5 @@
-using Grpc.Core;
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Infrastructure;
-using Grpc.Core.Interceptors;
-using Microsoft.Extensions.Logging;
-using System.Threading.Tasks;
 
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Infrastructure
-{
 public class GrpcExceptionInterceptor : Interceptor
 {
     private readonly ILogger<GrpcExceptionInterceptor> _logger;
@@ -38,4 +33,3 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Infrastructure
         }
     }
 }
-}

src/ApiGateways/Web.Bff.Shopping/aggregator/Infrastructure/HttpClientAuthorizationDelegatingHandler.cs

@@ -1,13 +1,5 @@
-using Microsoft.AspNetCore.Authentication;
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Infrastructure;
-using Microsoft.AspNetCore.Http;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Threading;
-using System.Threading.Tasks;
 
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Infrastructure
-{
 public class HttpClientAuthorizationDelegatingHandler
         : DelegatingHandler
 {
@@ -46,4 +38,3 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Infrastructure
             .GetTokenAsync(ACCESS_TOKEN);
     }
 }
-}

src/ApiGateways/Web.Bff.Shopping/aggregator/Models/AddBasketItemRequest.cs

@@ -1,5 +1,4 @@
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
-{
 
 public class AddBasketItemRequest
 {
@@ -15,4 +14,3 @@
     }
 }
 
-}

src/ApiGateways/Web.Bff.Shopping/aggregator/Models/BasketData.cs

@@ -1,7 +1,4 @@
-using System.Collections.Generic;
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
-
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
-{
 
 public class BasketData
 {
@@ -19,4 +16,3 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
     }
 }
 
-}

src/ApiGateways/Web.Bff.Shopping/aggregator/Models/BasketDataItem.cs

@@ -1,5 +1,4 @@
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
-{
 
 public class BasketDataItem
 {
@@ -17,5 +16,3 @@
 
     public string PictureUrl { get; set; }
 }
-
-}

src/ApiGateways/Web.Bff.Shopping/aggregator/Models/CatalogItem.cs

@@ -1,5 +1,4 @@
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
-{
 
 public class CatalogItem
 {
@@ -12,4 +11,4 @@
     public string PictureUri { get; set; }
 }
 
-}
+

src/ApiGateways/Web.Bff.Shopping/aggregator/Models/OrderData.cs

@@ -1,8 +1,4 @@
-using System;
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
-using System.Collections.Generic;
-
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
-{
 
 public class OrderData
 {
@@ -45,4 +41,3 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
     public List<OrderItemData> OrderItems { get; } = new List<OrderItemData>();
 }
 
-}

src/ApiGateways/Web.Bff.Shopping/aggregator/Models/OrderItemData.cs

@@ -1,5 +1,4 @@
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
-{
 
 public class OrderItemData
 {
@@ -15,5 +14,3 @@
 
     public string PictureUrl { get; set; }
 }
-
-}

src/ApiGateways/Web.Bff.Shopping/aggregator/Models/UpdateBasketItemData.cs

@@ -1,5 +1,4 @@
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
-{
 
 public class UpdateBasketItemData
 {
@@ -12,5 +11,3 @@
         NewQty = 0;
     }
 }
-
-}

src/ApiGateways/Web.Bff.Shopping/aggregator/Models/UpdateBasketItemsRequest.cs

@@ -1,7 +1,4 @@
-using System.Collections.Generic;
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
-
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
-{
 
 public class UpdateBasketItemsRequest
 {
@@ -14,5 +11,3 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
         Updates = new List<UpdateBasketItemData>();
     }
 }
-
-}

src/ApiGateways/Web.Bff.Shopping/aggregator/Models/UpdateBasketRequest.cs

@@ -1,7 +1,4 @@
-using System.Collections.Generic;
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
-
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
-{
 
 public class UpdateBasketRequest
 {
@@ -9,5 +6,3 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
 
     public IEnumerable<UpdateBasketRequestItemData> Items { get; set; }
 }
-
-}

src/ApiGateways/Web.Bff.Shopping/aggregator/Models/UpdateBasketRequestItemData.cs

@@ -1,5 +1,5 @@
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
-{
+
 public class UpdateBasketRequestItemData
 {
     public string Id { get; set; }          // Basket id
@@ -8,4 +8,3 @@
 
     public int Quantity { get; set; }       // Quantity
 }
-}

src/ApiGateways/Web.Bff.Shopping/aggregator/Program.cs

@@ -1,9 +1,4 @@
-using Microsoft.AspNetCore;
+BuildWebHost(args).Run();
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator;
-using Serilog;
-
-BuildWebHost(args).Run();
 
 IWebHost BuildWebHost(string[] args) =>
     WebHost

src/ApiGateways/Web.Bff.Shopping/aggregator/Services/BasketService.cs

@@ -1,11 +1,5 @@
-using GrpcBasket;
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services;
-using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
-using Microsoft.Extensions.Logging;
-using System.Linq;
-using System.Threading.Tasks;
 
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services
-{
 public class BasketService : IBasketService
 {
     private readonly Basket.BasketClient _basketClient;
@@ -100,4 +94,3 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services
         return map;
     }
 }
-}

src/ApiGateways/Web.Bff.Shopping/aggregator/Services/CatalogService.cs

@@ -1,12 +1,5 @@
-using CatalogApi;
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services;
-using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
-using Microsoft.Extensions.Logging;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services
-{
 public class CatalogService : ICatalogService
 {
     private readonly Catalog.CatalogClient _client;
@@ -49,4 +42,3 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services
         };
     }
 }
-}

src/ApiGateways/Web.Bff.Shopping/aggregator/Services/IBasketService.cs

@@ -1,12 +1,8 @@
-using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services;
-using System.Threading.Tasks;
 
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services
-{
 public interface IBasketService
 {
     Task<BasketData> GetById(string id);
 
     Task UpdateAsync(BasketData currentBasket);
 }
-}

src/ApiGateways/Web.Bff.Shopping/aggregator/Services/ICatalogService.cs

@@ -1,13 +1,8 @@
-using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services;
-using System.Collections.Generic;
-using System.Threading.Tasks;
 
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services
-{
 public interface ICatalogService
 {
     Task<CatalogItem> GetCatalogItemAsync(int id);
 
     Task<IEnumerable<CatalogItem>> GetCatalogItemsAsync(IEnumerable<int> ids);
 }
-}

src/ApiGateways/Web.Bff.Shopping/aggregator/Services/IOrderApiClient.cs

@@ -1,10 +1,6 @@
-using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services;
-using System.Threading.Tasks;
 
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services
-{
 public interface IOrderApiClient
 {
     Task<OrderData> GetOrderDraftFromBasketAsync(BasketData basket);
 }
-}

src/ApiGateways/Web.Bff.Shopping/aggregator/Services/IOrderingService.cs

@@ -1,10 +1,6 @@
-using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services;
-using System.Threading.Tasks;
 
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services
-{
 public interface IOrderingService
 {
     Task<OrderData> GetOrderDraftAsync(BasketData basketData);
 }
-}

src/ApiGateways/Web.Bff.Shopping/aggregator/Services/OrderApiClient.cs

@@ -1,13 +1,5 @@
-using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Config;
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services;
-using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using System.Net.Http;
-using System.Threading.Tasks;
-using System.Text.Json;
 
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services
-{
 public class OrderApiClient : IOrderApiClient
 {
     private readonly HttpClient _apiClient;
@@ -37,4 +29,3 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services
         });
     }
 }
-}

src/ApiGateways/Web.Bff.Shopping/aggregator/Services/OrderingService.cs

@@ -1,11 +1,5 @@
-using GrpcOrdering;
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services;
-using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Models;
-using Microsoft.Extensions.Logging;
-using System.Linq;
-using System.Threading.Tasks;
 
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services
-{
 public class OrderingService : IOrderingService
 {
     private readonly OrderingGrpc.OrderingGrpcClient _orderingGrpcClient;
@@ -76,4 +70,3 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services
     }
 
 }
-}

src/ApiGateways/Web.Bff.Shopping/aggregator/Startup.cs

@@ -1,30 +1,5 @@
-using CatalogApi;
+namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator;
-using Devspaces.Support;
-using GrpcBasket;
-using GrpcOrdering;
-using HealthChecks.UI.Client;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Diagnostics.HealthChecks;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Http;
-using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Config;
-using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Filters.Basket.API.Infrastructure.Filters;
-using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Infrastructure;
-using Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator.Services;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Diagnostics.HealthChecks;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
-using Microsoft.OpenApi.Models;
-using System;
-using System.Collections.Generic;
-using System.IdentityModel.Tokens.Jwt;
 
-namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator
-{
 public class Startup
 {
     public Startup(IConfiguration configuration)
@@ -222,4 +197,3 @@ namespace Microsoft.eShopOnContainers.Web.Shopping.HttpAggregator
         return services;
     }
 }
-}