misc: Refactor all files to use file-scoped namespaces

[skip ci]
nozzlegear · May 10, 2024 · 67dd349 · 67dd349
1 parent a1c9640
commit 67dd349
Show file tree

Hide file tree

Showing 418 changed files with 16,256 additions and 16,639 deletions.
diff --git a/ShopifySharp.Experimental/ShopifySharp.Experimental.fsproj b/ShopifySharp.Experimental/ShopifySharp.Experimental.fsproj
@@ -34,4 +34,4 @@
   <ItemGroup>
     <ProjectReference Include="..\ShopifySharp\ShopifySharp.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/ShopifySharp.Extensions.DependencyInjection.Tests/TestExtensions.cs b/ShopifySharp.Extensions.DependencyInjection.Tests/TestExtensions.cs
@@ -1,28 +1,27 @@
-namespace ShopifySharp.Extensions.DependencyInjection.Tests
+namespace ShopifySharp.Extensions.DependencyInjection.Tests;
+
+public static class ObjectExtensions
 {
-    public static class ObjectExtensions
+    private static readonly Dictionary<ServiceLifetime, bool> ServiceLifetimeInstanceValidation = new()
     {
-        private static readonly Dictionary<ServiceLifetime, bool> ServiceLifetimeInstanceValidation = new()
-        {
-            { ServiceLifetime.Scoped, true },
-            { ServiceLifetime.Singleton, true },
-            { ServiceLifetime.Transient, false }
-        };
+        { ServiceLifetime.Scoped, true },
+        { ServiceLifetime.Singleton, true },
+        { ServiceLifetime.Transient, false }
+    };
 
-        public static bool ValidLifetimeInstance(this object actual, object expceted, ServiceLifetime serviceLifetime)
-        {
-            return ServiceLifetimeInstanceValidation.TryGetValue(serviceLifetime, out bool value) && value ? ReferenceEquals(actual, expceted) : !ReferenceEquals(actual, expceted);
-        }
+    public static bool ValidLifetimeInstance(this object actual, object expceted, ServiceLifetime serviceLifetime)
+    {
+        return ServiceLifetimeInstanceValidation.TryGetValue(serviceLifetime, out bool value) && value ? ReferenceEquals(actual, expceted) : !ReferenceEquals(actual, expceted);
     }
+}
 
-    public static class ServiceProviderExtensions
+public static class ServiceProviderExtensions
+{
+    public static TestServiceLifetime<T> GetServiceInstances<T>(this ServiceProvider? serviceProvider) where T : class
     {
-        public static TestServiceLifetime<T> GetServiceInstances<T>(this ServiceProvider? serviceProvider) where T : class
-        {
-            var service1 = serviceProvider?.GetService<T>();
-            var service2 = serviceProvider?.GetService<T>();
+        var service1 = serviceProvider?.GetService<T>();
+        var service2 = serviceProvider?.GetService<T>();
 
-            return new TestServiceLifetime<T>(service1, service2);
-        }
+        return new TestServiceLifetime<T>(service1, service2);
     }
-}
+}
diff --git a/...fySharp.Extensions.DependencyInjection/ShopifySharp.Extensions.DependencyInjection.csproj b/...fySharp.Extensions.DependencyInjection/ShopifySharp.Extensions.DependencyInjection.csproj
@@ -27,4 +27,4 @@
   <ItemGroup>
     <PackageReference Include="microsoft.extensions.dependencyinjection" Version="8.0.0" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/ShopifySharp.Tests/Checkout_Tests.cs b/ShopifySharp.Tests/Checkout_Tests.cs
@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Xunit;
 
 namespace ShopifySharp.Tests;

diff --git a/ShopifySharp.Tests/CustomerAddress_Tests.cs b/ShopifySharp.Tests/CustomerAddress_Tests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;

diff --git a/ShopifySharp.Tests/DateTime_Tests.cs b/ShopifySharp.Tests/DateTime_Tests.cs
@@ -1,4 +1,4 @@
-#nullable enable
+#nullable enable
 using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;

diff --git a/ShopifySharp.Tests/DiscountCode_Tests.cs b/ShopifySharp.Tests/DiscountCode_Tests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Net;
 using System.Threading.Tasks;

diff --git a/ShopifySharp.Tests/FulfillmentRequest_Tests.cs b/ShopifySharp.Tests/FulfillmentRequest_Tests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;

diff --git a/ShopifySharp.Tests/GenerateGraphQLSchema_Test.cs b/ShopifySharp.Tests/GenerateGraphQLSchema_Test.cs
@@ -7,44 +7,43 @@
 using Wish.GraphQLSchemaGenerator;
 using Xunit;
 
-namespace ShopifySharp.Tests
+namespace ShopifySharp.Tests;
+
+[Trait("Category", "GraphQL")]
+public class GenerateGraphQLSchema_Test
 {
-    [Trait("Category", "GraphQL")]
-    public class GenerateGraphQLSchema_Test
+    [Fact(Skip = "This test should be run manually to re-generate the GraphQL types whenever the API version is upgraded")]
+    public async Task GenerateGraphQLTypes()
     {
-        [Fact(Skip = "This test should be run manually to re-generate the GraphQL types whenever the API version is upgraded")]
-        public async Task GenerateGraphQLTypes()
+        var scalarNameToTypeName = new Dictionary<string, string>
+        {
+            { "UnsignedInt64", "ulong" },
+            { "Money", "decimal" },
+            { "Decimal", "decimal" },
+            { "DateTime", "DateTime" },//GraphQL datetimes are always UTC
+            { "Date", "DateOnly" },
+            { "UtcOffset", "TimeSpan" },
+            { "URL", "string" },
+            { "HTML", "string" },
+            { "JSON", "string" },
+            { "FormattedString", "string" },
+            { "ARN", "string" },
+            { "StorefrontID", "string" },
+            { "Color", "string" },
+        };
+        string csharpCode = await new GraphQLTypeGenerator().GenerateTypesAsync("ShopifySharp.GraphQL", scalarNameToTypeName, async query =>
         {
-            var scalarNameToTypeName = new Dictionary<string, string>
-            {
-                { "UnsignedInt64", "ulong" },
-                { "Money", "decimal" },
-                { "Decimal", "decimal" },
-                { "DateTime", "DateTime" },//GraphQL datetimes are always UTC
-                { "Date", "DateOnly" },
-                { "UtcOffset", "TimeSpan" },
-                { "URL", "string" },
-                { "HTML", "string" },
-                { "JSON", "string" },
-                { "FormattedString", "string" },
-                { "ARN", "string" },
-                { "StorefrontID", "string" },
-                { "Color", "string" },
-            };
-            string csharpCode = await new GraphQLTypeGenerator().GenerateTypesAsync("ShopifySharp.GraphQL", scalarNameToTypeName, async query =>
-            {
-                var res = await new GraphService(Utils.MyShopifyUrl, Utils.AccessToken).PostAsync(query);
-                var doc = JsonDocument.Parse(res.ToString());
-                return doc;
-            });
+            var res = await new GraphService(Utils.MyShopifyUrl, Utils.AccessToken).PostAsync(query);
+            var doc = JsonDocument.Parse(res.ToString());
+            return doc;
+        });
 
-            var strCode = new StringBuilder()
-                                .AppendLine("#if NET6_0_OR_GREATER")
-                                .AppendLine(csharpCode)
-                                .AppendLine("#endif");
+        var strCode = new StringBuilder()
+            .AppendLine("#if NET6_0_OR_GREATER")
+            .AppendLine(csharpCode)
+            .AppendLine("#endif");
 
-            File.WriteAllText(@"../../../../ShopifySharp/Entities/GraphQL/GraphQLSchema.generated.cs", strCode.ToString());
-        }
+        File.WriteAllText(@"../../../../ShopifySharp/Entities/GraphQL/GraphQLSchema.generated.cs", strCode.ToString());
     }
 }
 #endif
diff --git a/ShopifySharp.Tests/GiftCard_Tests.cs b/ShopifySharp.Tests/GiftCard_Tests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;

diff --git a/ShopifySharp.Tests/Graph_SendTests.cs b/ShopifySharp.Tests/Graph_SendTests.cs
@@ -4,24 +4,24 @@
 using ShopifySharp.GraphQL;
 using Xunit;
 
-namespace ShopifySharp.Tests
+namespace ShopifySharp.Tests;
+
+[Trait("Category", "Graph")]
+public class Graph_SendTests
 {
-    [Trait("Category", "Graph")]
-    public class Graph_SendTests
+    [Fact]
+    public async Task GetOrders()
     {
-        [Fact]
-        public async Task GetOrders()
+        foreach (var policy in new IRequestExecutionPolicy[]
+                 {
+                     new DefaultRequestExecutionPolicy(),
+                     new RetryExecutionPolicy(),
+                     new LeakyBucketExecutionPolicy()
+                 })
         {
-            foreach (var policy in new IRequestExecutionPolicy[]
-            {
-                new DefaultRequestExecutionPolicy(),
-                new RetryExecutionPolicy(),
-                new LeakyBucketExecutionPolicy()
-            })
-            {
-                var svc = new GraphService(Utils.MyShopifyUrl, Utils.AccessToken);
-                svc.SetExecutionPolicy(policy);
-                var res = await svc.SendAsync<OrderConnection>(@"
+            var svc = new GraphService(Utils.MyShopifyUrl, Utils.AccessToken);
+            svc.SetExecutionPolicy(policy);
+            var res = await svc.SendAsync<OrderConnection>(@"
 {
 	orders(first:10)
   {
@@ -43,33 +43,33 @@ public async Task GetOrders()
   }
 }
 ");
-                var orders = res.nodes;
-                Assert.True(orders.Count() > 0);
-                var o = orders.First();
-                Assert.True(o.name != null);
-                Assert.True(o.lineItems.nodes.First().quantity != null);
-                var commentEventEmbed = o as ICommentEventEmbed;
-                Assert.NotNull(commentEventEmbed);
-                Assert.NotNull(commentEventEmbed.AsOrder());
-                Assert.Null(commentEventEmbed.AsCustomer());
-            }
+            var orders = res.nodes;
+            Assert.True(orders.Count() > 0);
+            var o = orders.First();
+            Assert.True(o.name != null);
+            Assert.True(o.lineItems.nodes.First().quantity != null);
+            var commentEventEmbed = o as ICommentEventEmbed;
+            Assert.NotNull(commentEventEmbed);
+            Assert.NotNull(commentEventEmbed.AsOrder());
+            Assert.Null(commentEventEmbed.AsCustomer());
         }
+    }
 
-        [Fact]
-        public async Task GetOrdersWithVariables()
+    [Fact]
+    public async Task GetOrdersWithVariables()
+    {
+        foreach (var policy in new IRequestExecutionPolicy[]
+                 {
+                     new DefaultRequestExecutionPolicy(),
+                     new RetryExecutionPolicy(),
+                     new LeakyBucketExecutionPolicy()
+                 })
         {
-            foreach (var policy in new IRequestExecutionPolicy[]
-            {
-                new DefaultRequestExecutionPolicy(),
-                new RetryExecutionPolicy(),
-                new LeakyBucketExecutionPolicy()
-            })
+            var svc = new GraphService(Utils.MyShopifyUrl, Utils.AccessToken);
+            svc.SetExecutionPolicy(policy);
+            var res = await svc.SendAsync<OrderConnection>(new GraphRequest
             {
-                var svc = new GraphService(Utils.MyShopifyUrl, Utils.AccessToken);
-                svc.SetExecutionPolicy(policy);
-                var res = await svc.SendAsync<OrderConnection>(new GraphRequest
-                {
-                    query =
+                query =
                     @"
 query ($firstOrders: Int!, $firstLineItems: Int!)
 {
@@ -92,22 +92,21 @@ public async Task GetOrdersWithVariables()
     }
   }
 }",
-                    variables = new
-                    {
-                        firstOrders = 10,
-                        firstLineItems = 20
-                    }
-                });
-                var orders = res.nodes;
-                Assert.True(orders.Count() > 0);
-                var o = orders.First();
-                Assert.True(o.name != null);
-                Assert.True(o.lineItems.nodes.First().quantity != null);
-                var commentEventEmbed = o as ICommentEventEmbed;
-                Assert.NotNull(commentEventEmbed);
-                Assert.NotNull(commentEventEmbed.AsOrder());
-                Assert.Null(commentEventEmbed.AsCustomer());
-            }
+                variables = new
+                {
+                    firstOrders = 10,
+                    firstLineItems = 20
+                }
+            });
+            var orders = res.nodes;
+            Assert.True(orders.Count() > 0);
+            var o = orders.First();
+            Assert.True(o.name != null);
+            Assert.True(o.lineItems.nodes.First().quantity != null);
+            var commentEventEmbed = o as ICommentEventEmbed;
+            Assert.NotNull(commentEventEmbed);
+            Assert.NotNull(commentEventEmbed.AsOrder());
+            Assert.Null(commentEventEmbed.AsCustomer());
         }
     }
 }

diff --git a/ShopifySharp.Tests/LeakyBucket_Tests.cs b/ShopifySharp.Tests/LeakyBucket_Tests.cs
@@ -1,5 +1,7 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
+using FluentAssertions;
 using ShopifySharp.Infrastructure.Policies.LeakyBucketPolicy;
 using Xunit;
 
@@ -124,7 +126,7 @@ public async Task BlockedMultipleCallsCompleteAfterEnoughTime()
         Assert.False(task3.IsCompleted);
 
         Assert.Equal(1, b.ComputedCurrentlyAvailable);
-            
+
         await PassSeconds(1);
         Assert.True(task1.IsCompleted);
         Assert.False(task2.IsCompleted);
@@ -163,4 +165,4 @@ private async Task PassSeconds(int seconds)
         now = now.AddSeconds(seconds);
         await Task.Delay(TimeSpan.FromSeconds(seconds * 1.2));
     }
-}
+}
diff --git a/ShopifySharp.Tests/Policies/LeakyBucketExecutionPolicyTests.cs b/ShopifySharp.Tests/Policies/LeakyBucketExecutionPolicyTests.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using FluentAssertions;
 using JetBrains.Annotations;

diff --git a/ShopifySharp.Tests/SalesChannel/CheckoutSalesChannel_Tests.cs b/ShopifySharp.Tests/SalesChannel/CheckoutSalesChannel_Tests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;

diff --git a/ShopifySharp.Tests/SalesChannel/CollectionListing_Tests.cs b/ShopifySharp.Tests/SalesChannel/CollectionListing_Tests.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
 using Xunit;
 

diff --git a/ShopifySharp.Tests/SalesChannel/ProductListing_Tests.cs b/ShopifySharp.Tests/SalesChannel/ProductListing_Tests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;

diff --git a/ShopifySharp.Tests/ShopifySharp.Tests.csproj b/ShopifySharp.Tests/ShopifySharp.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
     <TargetFrameworks>net8.0;net472</TargetFrameworks>

diff --git a/ShopifySharp.Tests/TenderTransaction_Tests.cs b/ShopifySharp.Tests/TenderTransaction_Tests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Threading.Tasks;
 using ShopifySharp.Filters;

diff --git a/ShopifySharp.Tests/User_Tests.cs b/ShopifySharp.Tests/User_Tests.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
 using ShopifySharp.Filters;
 using Xunit;