From 91725a7b90933b13fc37117a44151e5c7ae7e13e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Sun, 1 Apr 2018 20:43:38 +0300
Subject: [PATCH] Remove ICurrentTenant.Clear

---
 .../Volo/Abp/EntityFrameworkCore/AbpDbContext.cs            | 6 +++---
 .../Volo/Abp/MultiTenancy/CurrentTenant.cs                  | 5 -----
 .../Volo/Abp/MultiTenancy/ICurrentTenant.cs                 | 2 --
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
index aca9fb8fd7..80e4ede0d9 100644
--- a/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
+++ b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
@@ -22,9 +22,9 @@ namespace Volo.Abp.EntityFrameworkCore
     public abstract class AbpDbContext<TDbContext> : DbContext, IEfCoreDbContext
         where TDbContext : DbContext
     {
-        public virtual Guid? CurrentTenantId => CurrentTenant?.Id;
+        protected virtual Guid? CurrentTenantId => CurrentTenant?.Id;
 
-        protected virtual bool IsMayHaveTenantFilterEnabled => DataFilter.IsEnabled<IMultiTenant>();
+        protected virtual bool IsMultiTenantFilterEnabled => DataFilter.IsEnabled<IMultiTenant>();
 
         protected virtual bool IsSoftDeleteFilterEnabled => DataFilter.IsEnabled<ISoftDelete>();
 
@@ -307,7 +307,7 @@ namespace Volo.Abp.EntityFrameworkCore
                  * But this causes a problem with EF Core (see https://github.com/aspnet/EntityFrameworkCore/issues/9502)
                  * So, we made a workaround to make it working. It works same as above.
                  */
-                Expression<Func<TEntity, bool>> multiTenantFilter = e => ((IMultiTenant)e).TenantId == CurrentTenantId || (((IMultiTenant)e).TenantId == CurrentTenantId) == IsMayHaveTenantFilterEnabled;
+                Expression<Func<TEntity, bool>> multiTenantFilter = e => ((IMultiTenant)e).TenantId == CurrentTenantId || (((IMultiTenant)e).TenantId == CurrentTenantId) == IsMultiTenantFilterEnabled;
                 expression = expression == null ? multiTenantFilter : CombineExpressions(expression, multiTenantFilter);
             }
 
diff --git a/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/CurrentTenant.cs b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/CurrentTenant.cs
index 743355d415..9aee172ba9 100644
--- a/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/CurrentTenant.cs
+++ b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/CurrentTenant.cs
@@ -21,11 +21,6 @@ namespace Volo.Abp.MultiTenancy
             return SetCurrent(id);
         }
 
-        public IDisposable Clear() //TODO: Remove
-        {
-            return Change(null);
-        }
-
         private IDisposable SetCurrent(Guid? tenantId)
         {
             var parentScope = _currentTenantIdAccessor.Current;
diff --git a/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ICurrentTenant.cs b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ICurrentTenant.cs
index 1c5cd0b352..15eb581a40 100644
--- a/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ICurrentTenant.cs
+++ b/src/Volo.Abp.MultiTenancy.Abstractions/Volo/Abp/MultiTenancy/ICurrentTenant.cs
@@ -11,7 +11,5 @@ namespace Volo.Abp.MultiTenancy
         Guid? Id { get; }
 
         IDisposable Change(Guid? id);
-
-        IDisposable Clear();
     }
 }