From 2276c460270509c12860a0d8b1c063560b1259e3 Mon Sep 17 00:00:00 2001
From: Sumit Ghosh <sumit.ghosh@neudesic.com>
Date: Wed, 13 Oct 2021 18:09:11 +0530
Subject: [PATCH] Moved using statements to globalusing Devspaces

---
 .../DevspacesMessageHandler.cs                | 35 ++++++++-----------
 .../HttpClientBuilderDevspacesExtensions.cs   | 13 +++----
 .../ServiceCollectionDevspacesExtensions.cs   | 13 +++----
 3 files changed, 24 insertions(+), 37 deletions(-)

diff --git a/src/BuildingBlocks/Devspaces.Support/DevspacesMessageHandler.cs b/src/BuildingBlocks/Devspaces.Support/DevspacesMessageHandler.cs
index 43dfa82f1..ac054693f 100644
--- a/src/BuildingBlocks/Devspaces.Support/DevspacesMessageHandler.cs
+++ b/src/BuildingBlocks/Devspaces.Support/DevspacesMessageHandler.cs
@@ -1,29 +1,22 @@
-using Microsoft.AspNetCore.Http;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
+namespace Devspaces.Support;
 
-namespace Devspaces.Support
+public class DevspacesMessageHandler : DelegatingHandler
 {
-    public class DevspacesMessageHandler : DelegatingHandler
+    private const string DevspacesHeaderName = "azds-route-as";
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    public DevspacesMessageHandler(IHttpContextAccessor httpContextAccessor)
     {
-        private const string DevspacesHeaderName = "azds-route-as";
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        public DevspacesMessageHandler(IHttpContextAccessor httpContextAccessor)
-        {
-            _httpContextAccessor = httpContextAccessor;
-        }
+        _httpContextAccessor = httpContextAccessor;
+    }
 
-        protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
-        {
-            var req = _httpContextAccessor.HttpContext.Request;
+    protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+    {
+        var req = _httpContextAccessor.HttpContext.Request;
 
-            if (req.Headers.ContainsKey(DevspacesHeaderName))
-            {
-                request.Headers.Add(DevspacesHeaderName, req.Headers[DevspacesHeaderName] as IEnumerable<string>);
-            }
-            return base.SendAsync(request, cancellationToken);
+        if (req.Headers.ContainsKey(DevspacesHeaderName))
+        {
+            request.Headers.Add(DevspacesHeaderName, req.Headers[DevspacesHeaderName] as IEnumerable<string>);
         }
+        return base.SendAsync(request, cancellationToken);
     }
 }
diff --git a/src/BuildingBlocks/Devspaces.Support/HttpClientBuilderDevspacesExtensions.cs b/src/BuildingBlocks/Devspaces.Support/HttpClientBuilderDevspacesExtensions.cs
index 00367b26c..fd78b9a40 100644
--- a/src/BuildingBlocks/Devspaces.Support/HttpClientBuilderDevspacesExtensions.cs
+++ b/src/BuildingBlocks/Devspaces.Support/HttpClientBuilderDevspacesExtensions.cs
@@ -1,13 +1,10 @@
-using Microsoft.Extensions.DependencyInjection;
+namespace Devspaces.Support;
 
-namespace Devspaces.Support
+public static class HttpClientBuilderDevspacesExtensions
 {
-    public static class HttpClientBuilderDevspacesExtensions
+    public static IHttpClientBuilder AddDevspacesSupport(this IHttpClientBuilder builder)
     {
-        public static IHttpClientBuilder AddDevspacesSupport(this IHttpClientBuilder builder)
-        {
-            builder.AddHttpMessageHandler<DevspacesMessageHandler>();
-            return builder;
-        }
+        builder.AddHttpMessageHandler<DevspacesMessageHandler>();
+        return builder;
     }
 }
diff --git a/src/BuildingBlocks/Devspaces.Support/ServiceCollectionDevspacesExtensions.cs b/src/BuildingBlocks/Devspaces.Support/ServiceCollectionDevspacesExtensions.cs
index d196c9184..15c3b1515 100644
--- a/src/BuildingBlocks/Devspaces.Support/ServiceCollectionDevspacesExtensions.cs
+++ b/src/BuildingBlocks/Devspaces.Support/ServiceCollectionDevspacesExtensions.cs
@@ -1,13 +1,10 @@
-using Microsoft.Extensions.DependencyInjection;
+namespace Devspaces.Support;
 
-namespace Devspaces.Support
+public static class ServiceCollectionDevspacesExtensions
 {
-    public static class ServiceCollectionDevspacesExtensions
+    public static IServiceCollection AddDevspaces(this IServiceCollection services)
     {
-        public static IServiceCollection AddDevspaces(this IServiceCollection services)
-        {
-            services.AddTransient<DevspacesMessageHandler>();
-            return services;
-        }
+        services.AddTransient<DevspacesMessageHandler>();
+        return services;
     }
 }