From 64cf179f93badce0b8fc5d56aa1857905376da62 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Tue, 15 Oct 2019 14:17:51 +0300
Subject: [PATCH] DefaultTenantStoreOptions to AbpDefaultTenantStoreOptions

---
 .../Volo/Abp/MultiTenancy/AbpMultiTenancyModule.cs            | 2 +-
 ...tTenantStoreOptions.cs => AbpDefaultTenantStoreOptions.cs} | 4 ++--
 .../Abp/MultiTenancy/ConfigurationStore/DefaultTenantStore.cs | 4 ++--
 .../AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs        | 2 +-
 .../AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs    | 2 +-
 .../MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs | 2 +-
 .../Volo/Abp/MultiTenancy/CurrentTenant_Tests.cs              | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/{DefaultTenantStoreOptions.cs => AbpDefaultTenantStoreOptions.cs} (68%)

diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AbpMultiTenancyModule.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AbpMultiTenancyModule.cs
index 75d5631658..9dc64ef7f8 100644
--- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AbpMultiTenancyModule.cs
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/AbpMultiTenancyModule.cs
@@ -17,7 +17,7 @@ namespace Volo.Abp.MultiTenancy
         public override void ConfigureServices(ServiceConfigurationContext context)
         {
             var configuration = context.Services.GetConfiguration();
-            Configure<DefaultTenantStoreOptions>(configuration);
+            Configure<AbpDefaultTenantStoreOptions>(configuration);
         }
     }
 }
diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStoreOptions.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/AbpDefaultTenantStoreOptions.cs
similarity index 68%
rename from framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStoreOptions.cs
rename to framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/AbpDefaultTenantStoreOptions.cs
index ee775cce98..72027efa62 100644
--- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStoreOptions.cs
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/AbpDefaultTenantStoreOptions.cs
@@ -1,10 +1,10 @@
 namespace Volo.Abp.MultiTenancy.ConfigurationStore
 {
-    public class DefaultTenantStoreOptions
+    public class AbpDefaultTenantStoreOptions
     {
         public TenantConfiguration[] Tenants { get; set; }
 
-        public DefaultTenantStoreOptions()
+        public AbpDefaultTenantStoreOptions()
         {
             Tenants = new TenantConfiguration[0];
         }
diff --git a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStore.cs b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStore.cs
index edecf22b65..ebdbe2a280 100644
--- a/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStore.cs
+++ b/framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/ConfigurationStore/DefaultTenantStore.cs
@@ -9,9 +9,9 @@ namespace Volo.Abp.MultiTenancy.ConfigurationStore
     [Dependency(TryRegister = true)]
     public class DefaultTenantStore : ITenantStore, ITransientDependency
     {
-        private readonly DefaultTenantStoreOptions _options;
+        private readonly AbpDefaultTenantStoreOptions _options;
 
-        public DefaultTenantStore(IOptionsSnapshot<DefaultTenantStoreOptions> options)
+        public DefaultTenantStore(IOptionsSnapshot<AbpDefaultTenantStoreOptions> options)
         {
             _options = options.Value;
         }
diff --git a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs
index ed440cb130..310817b8d8 100644
--- a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs
+++ b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_WithDomainResolver_Tests.cs
@@ -27,7 +27,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
         {
             return base.CreateWebHostBuilder().ConfigureServices(services =>
             {
-                services.Configure<DefaultTenantStoreOptions>(options =>
+                services.Configure<AbpDefaultTenantStoreOptions>(options =>
                 {
                     options.Tenants = new[]
                     {
diff --git a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs
index 98a7e92ef1..4b5c3f7ecc 100644
--- a/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs
+++ b/framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo/Abp/AspNetCore/MultiTenancy/AspNetCoreMultiTenancy_Without_DomainResolver_Tests.cs
@@ -28,7 +28,7 @@ namespace Volo.Abp.AspNetCore.MultiTenancy
         {
             return base.CreateWebHostBuilder().ConfigureServices(services =>
             {
-                services.Configure<DefaultTenantStoreOptions>(options =>
+                services.Configure<AbpDefaultTenantStoreOptions>(options =>
                 {
                     options.Tenants = new[]
                     {
diff --git a/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs b/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs
index 20f926f212..aea2810d5e 100644
--- a/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs
+++ b/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs
@@ -31,7 +31,7 @@ namespace Volo.Abp.Data.MultiTenancy
                 options.ConnectionStrings["db1"] = "db1-default-value";
             });
 
-            services.Configure<DefaultTenantStoreOptions>(options =>
+            services.Configure<AbpDefaultTenantStoreOptions>(options =>
             {
                 options.Tenants = new[]
                 {
diff --git a/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/CurrentTenant_Tests.cs b/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/CurrentTenant_Tests.cs
index 4bd1c6bad3..0790a54c65 100644
--- a/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/CurrentTenant_Tests.cs
+++ b/framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/CurrentTenant_Tests.cs
@@ -28,7 +28,7 @@ namespace Volo.Abp.MultiTenancy
 
         protected override void BeforeAddApplication(IServiceCollection services)
         {
-            services.Configure<DefaultTenantStoreOptions>(options =>
+            services.Configure<AbpDefaultTenantStoreOptions>(options =>
             {
                 options.Tenants = new[]
                 {