From ccb328bf031975c7cb9b5822406a451cf731c060 Mon Sep 17 00:00:00 2001
From: Elan Hasson <234704+ElanHasson@users.noreply.github.com>
Date: Tue, 20 Sep 2022 01:14:06 -0400
Subject: [PATCH] Fix Namespaces (#19)

---
 .../Abstractions/INamedStorageInterceptorFactory.cs           | 1 -
 .../Abstractions/IStorageInterceptor.cs                       | 2 +-
 .../Abstractions/IStorageInterceptorConfig.cs                 | 2 +-
 .../Abstractions/IStorageInterceptorFactory.cs                | 2 +-
 .../Abstractions/StorageInterceptorAttribute.cs               | 2 +-
 .../Abstractions/StorageInterceptorConfig.cs                  | 2 +-
 .../Infrastructure/NamedStorageInterceptorFactory.cs          | 3 +--
 .../Infrastructure/StorageInterceptorAttributeMapper.cs       | 3 +--
 .../Infrastructure/StorageInterceptorExtensions.cs            | 4 +---
 Source/Sample/Program.cs                                      | 4 ++--
 10 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/Source/Orleans.StorageProviderInterceptors/Abstractions/INamedStorageInterceptorFactory.cs b/Source/Orleans.StorageProviderInterceptors/Abstractions/INamedStorageInterceptorFactory.cs
index ede3f3c..f49cf06 100644
--- a/Source/Orleans.StorageProviderInterceptors/Abstractions/INamedStorageInterceptorFactory.cs
+++ b/Source/Orleans.StorageProviderInterceptors/Abstractions/INamedStorageInterceptorFactory.cs
@@ -1,5 +1,4 @@
 namespace Orleans.StorageProviderInterceptors.Abstractions;
-using Tester.StorageFacet.Abstractions;
 
 using Orleans.Runtime;
 
diff --git a/Source/Orleans.StorageProviderInterceptors/Abstractions/IStorageInterceptor.cs b/Source/Orleans.StorageProviderInterceptors/Abstractions/IStorageInterceptor.cs
index 091ebae..236df56 100644
--- a/Source/Orleans.StorageProviderInterceptors/Abstractions/IStorageInterceptor.cs
+++ b/Source/Orleans.StorageProviderInterceptors/Abstractions/IStorageInterceptor.cs
@@ -1,4 +1,4 @@
-namespace Tester.StorageFacet.Abstractions;
+namespace Orleans.StorageProviderInterceptors.Abstractions;
 using Orleans.Runtime;
 using Orleans;
 
diff --git a/Source/Orleans.StorageProviderInterceptors/Abstractions/IStorageInterceptorConfig.cs b/Source/Orleans.StorageProviderInterceptors/Abstractions/IStorageInterceptorConfig.cs
index 15f953f..e9b2827 100644
--- a/Source/Orleans.StorageProviderInterceptors/Abstractions/IStorageInterceptorConfig.cs
+++ b/Source/Orleans.StorageProviderInterceptors/Abstractions/IStorageInterceptorConfig.cs
@@ -1,4 +1,4 @@
-namespace Tester.StorageFacet.Abstractions;
+namespace Orleans.StorageProviderInterceptors.Abstractions;
 
 using Orleans.Runtime;
 using Orleans.Storage;
diff --git a/Source/Orleans.StorageProviderInterceptors/Abstractions/IStorageInterceptorFactory.cs b/Source/Orleans.StorageProviderInterceptors/Abstractions/IStorageInterceptorFactory.cs
index bc93ea3..24d36f0 100644
--- a/Source/Orleans.StorageProviderInterceptors/Abstractions/IStorageInterceptorFactory.cs
+++ b/Source/Orleans.StorageProviderInterceptors/Abstractions/IStorageInterceptorFactory.cs
@@ -1,4 +1,4 @@
-namespace Tester.StorageFacet.Abstractions;
+namespace Orleans.StorageProviderInterceptors.Abstractions;
 
 using Orleans.Runtime;
 
diff --git a/Source/Orleans.StorageProviderInterceptors/Abstractions/StorageInterceptorAttribute.cs b/Source/Orleans.StorageProviderInterceptors/Abstractions/StorageInterceptorAttribute.cs
index 576c562..c1201dd 100644
--- a/Source/Orleans.StorageProviderInterceptors/Abstractions/StorageInterceptorAttribute.cs
+++ b/Source/Orleans.StorageProviderInterceptors/Abstractions/StorageInterceptorAttribute.cs
@@ -1,4 +1,4 @@
-namespace Tester.StorageFacet.Abstractions;
+namespace Orleans.StorageProviderInterceptors.Abstractions;
 using System;
 using Orleans;
 
diff --git a/Source/Orleans.StorageProviderInterceptors/Abstractions/StorageInterceptorConfig.cs b/Source/Orleans.StorageProviderInterceptors/Abstractions/StorageInterceptorConfig.cs
index 1bd4f2b..8622a64 100644
--- a/Source/Orleans.StorageProviderInterceptors/Abstractions/StorageInterceptorConfig.cs
+++ b/Source/Orleans.StorageProviderInterceptors/Abstractions/StorageInterceptorConfig.cs
@@ -1,4 +1,4 @@
-namespace Tester.StorageFacet.Abstractions;
+namespace Orleans.StorageProviderInterceptors.Abstractions;
 
 /// <summary>
 /// Feature configuration utility class
diff --git a/Source/Orleans.StorageProviderInterceptors/Infrastructure/NamedStorageInterceptorFactory.cs b/Source/Orleans.StorageProviderInterceptors/Infrastructure/NamedStorageInterceptorFactory.cs
index 9dc2a55..cf5243b 100644
--- a/Source/Orleans.StorageProviderInterceptors/Infrastructure/NamedStorageInterceptorFactory.cs
+++ b/Source/Orleans.StorageProviderInterceptors/Infrastructure/NamedStorageInterceptorFactory.cs
@@ -7,10 +7,9 @@ namespace Orleans.StorageProviderInterceptors.Infrastructure;
 using Orleans.Runtime;
 using Orleans.Storage;
 using Orleans.Utilities;
-using Tester.StorageFacet.Abstractions;
+using Orleans.StorageProviderInterceptors.Abstractions;
 using System.Text;
 using System.Collections.Concurrent;
-using Orleans.StorageProviderInterceptors.Abstractions;
 using Orleans.Hosting;
 
 /// <summary>
diff --git a/Source/Orleans.StorageProviderInterceptors/Infrastructure/StorageInterceptorAttributeMapper.cs b/Source/Orleans.StorageProviderInterceptors/Infrastructure/StorageInterceptorAttributeMapper.cs
index 333a0ca..0707535 100644
--- a/Source/Orleans.StorageProviderInterceptors/Infrastructure/StorageInterceptorAttributeMapper.cs
+++ b/Source/Orleans.StorageProviderInterceptors/Infrastructure/StorageInterceptorAttributeMapper.cs
@@ -1,10 +1,9 @@
-namespace Tester.StorageFacet.Infrastructure;
+namespace Orleans.StorageProviderInterceptors.Infrastructure;
 using System.Reflection;
 using Microsoft.Extensions.DependencyInjection;
 using Orleans;
 using Orleans.Runtime;
 using Orleans.StorageProviderInterceptors.Abstractions;
-using Tester.StorageFacet.Abstractions;
 
 /// <summary>
 /// TODO
diff --git a/Source/Orleans.StorageProviderInterceptors/Infrastructure/StorageInterceptorExtensions.cs b/Source/Orleans.StorageProviderInterceptors/Infrastructure/StorageInterceptorExtensions.cs
index 8189fe6..3cea33b 100644
--- a/Source/Orleans.StorageProviderInterceptors/Infrastructure/StorageInterceptorExtensions.cs
+++ b/Source/Orleans.StorageProviderInterceptors/Infrastructure/StorageInterceptorExtensions.cs
@@ -3,8 +3,6 @@ namespace Orleans.Hosting;
 using Orleans.Runtime;
 using Orleans.StorageProviderInterceptors.Abstractions;
 using Orleans.StorageProviderInterceptors.Infrastructure;
-using Tester.StorageFacet.Abstractions;
-using Tester.StorageFacet.Infrastructure;
 
 /// <summary>
 /// TODO
@@ -15,7 +13,7 @@ public static class StorageInterceptorExtensions
     /// TODO
     /// </summary>
     /// <param name="builder"></param>
-    public static ISiloBuilder UseStorageInterceptor(this ISiloBuilder builder) => builder.ConfigureServices(services =>
+    public static ISiloBuilder AddStorageInterceptors(this ISiloBuilder builder) => builder.ConfigureServices(services =>
 {
     // storage feature factory infrastructure
     services.AddTransient<INamedStorageInterceptorFactory, NamedStorageInterceptorFactory>();
diff --git a/Source/Sample/Program.cs b/Source/Sample/Program.cs
index a60d5ae..fd569d0 100644
--- a/Source/Sample/Program.cs
+++ b/Source/Sample/Program.cs
@@ -5,8 +5,8 @@
 using Orleans.Configuration;
 using Orleans.Hosting;
 using Orleans.Runtime;
+using Orleans.StorageProviderInterceptors.Abstractions;
 using Sample;
-using Tester.StorageFacet.Abstractions;
 
 // Configure the host
 
@@ -17,7 +17,7 @@
         .Configure<StatisticsOptions>(c => c.CollectionLevel = Orleans.Runtime.Configuration.StatisticsLevel.Critical)
         .ConfigureLogging(c => c.SetMinimumLevel(LogLevel.None))
         .AddMemoryGrainStorage("SecretsStorage")
-        .UseStorageInterceptor()
+        .AddStorageInterceptors()
         .UseGenericStorageInterceptor<Dictionary<string, string>>("SecretsStorage", "secretsState", c =>
         {
             c.OnBeforeReadStateAsync = (grainActivationContext, currentState) =>