From 8503f9b6ac165c1c396ec8cf56330b4792b82044 Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Tue, 15 Oct 2019 15:53:03 +0300
Subject: [PATCH] EntityOptions to AbpEntityOptions

---
 .../EntityFrameworkCore/EfCoreRepository.cs    | 14 +++++++-------
 .../AbpDbContextRegistrationOptions.cs         |  8 ++++----
 .../{EntityOptions.cs => AbpEntityOptions.cs}  | 18 +++++++++---------
 .../IAbpDbContextRegistrationOptionsBuilder.cs |  2 +-
 ...jectNameModelBuilderConfigurationOptions.cs |  2 +-
 5 files changed, 22 insertions(+), 22 deletions(-)
 rename framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/{EntityOptions.cs => AbpEntityOptions.cs} (58%)

diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs
index e26624747c..bfedcf2d66 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/Domain/Repositories/EntityFrameworkCore/EfCoreRepository.cs
@@ -23,20 +23,20 @@ namespace Volo.Abp.Domain.Repositories.EntityFrameworkCore
 
         protected virtual TDbContext DbContext => _dbContextProvider.GetDbContext();
 
-        protected virtual EntityOptions<TEntity> EntityOptions => _entityOptionsLazy.Value;
+        protected virtual AbpEntityOptions<TEntity> AbpEntityOptions => _entityOptionsLazy.Value;
 
         private readonly IDbContextProvider<TDbContext> _dbContextProvider;
-        private readonly Lazy<EntityOptions<TEntity>> _entityOptionsLazy;
+        private readonly Lazy<AbpEntityOptions<TEntity>> _entityOptionsLazy;
 
         public EfCoreRepository(IDbContextProvider<TDbContext> dbContextProvider)
         {
             _dbContextProvider = dbContextProvider;
 
-            _entityOptionsLazy = new Lazy<EntityOptions<TEntity>>(
+            _entityOptionsLazy = new Lazy<AbpEntityOptions<TEntity>>(
                 () => ServiceProvider
-                          .GetRequiredService<IOptions<EntityOptions>>()
+                          .GetRequiredService<IOptions<AbpEntityOptions>>()
                           .Value
-                          .GetOrNull<TEntity>() ?? EntityOptions<TEntity>.Empty
+                          .GetOrNull<TEntity>() ?? AbpEntityOptions<TEntity>.Empty
             );
         }
         
@@ -194,12 +194,12 @@ namespace Volo.Abp.Domain.Repositories.EntityFrameworkCore
 
         public override IQueryable<TEntity> WithDetails()
         {
-            if (EntityOptions.DefaultWithDetailsFunc == null)
+            if (AbpEntityOptions.DefaultWithDetailsFunc == null)
             {
                 return base.WithDetails();
             }
 
-            return EntityOptions.DefaultWithDetailsFunc(GetQueryable());
+            return AbpEntityOptions.DefaultWithDetailsFunc(GetQueryable());
         }
 
         public override IQueryable<TEntity> WithDetails(params Expression<Func<TEntity, object>>[] propertySelectors)
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextRegistrationOptions.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextRegistrationOptions.cs
index 50f2a4bce5..52b654aa88 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextRegistrationOptions.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpDbContextRegistrationOptions.cs
@@ -8,17 +8,17 @@ namespace Volo.Abp.EntityFrameworkCore.DependencyInjection
 {
     public class AbpDbContextRegistrationOptions : AbpCommonDbContextRegistrationOptions, IAbpDbContextRegistrationOptionsBuilder
     {
-        public Dictionary<Type, object> EntityOptions { get; }
+        public Dictionary<Type, object> AbpEntityOptions { get; }
 
         public AbpDbContextRegistrationOptions(Type originalDbContextType, IServiceCollection services)
             : base(originalDbContextType, services)
         {
-            EntityOptions = new Dictionary<Type, object>();
+            AbpEntityOptions = new Dictionary<Type, object>();
         }
 
-        public void Entity<TEntity>(Action<EntityOptions<TEntity>> optionsAction) where TEntity : IEntity
+        public void Entity<TEntity>(Action<AbpEntityOptions<TEntity>> optionsAction) where TEntity : IEntity
         {
-            Services.Configure<EntityOptions>(options =>
+            Services.Configure<AbpEntityOptions>(options =>
             {
                 options.Entity(optionsAction);
             });
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/EntityOptions.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpEntityOptions.cs
similarity index 58%
rename from framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/EntityOptions.cs
rename to framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpEntityOptions.cs
index b465dcc667..239ceb04a8 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/EntityOptions.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/AbpEntityOptions.cs
@@ -6,30 +6,30 @@ using Volo.Abp.Domain.Entities;
 
 namespace Volo.Abp.EntityFrameworkCore.DependencyInjection
 {
-    public class EntityOptions<TEntity>
+    public class AbpEntityOptions<TEntity>
         where TEntity : IEntity
     {
-        public static EntityOptions<TEntity> Empty { get; } = new EntityOptions<TEntity>();
+        public static AbpEntityOptions<TEntity> Empty { get; } = new AbpEntityOptions<TEntity>();
 
         public Func<IQueryable<TEntity>, IQueryable<TEntity>> DefaultWithDetailsFunc { get; set; }
     }
 
-    public class EntityOptions
+    public class AbpEntityOptions
     {
         private readonly IDictionary<Type, object> _options;
 
-        public EntityOptions()
+        public AbpEntityOptions()
         {
             _options = new Dictionary<Type, object>();
         }
 
-        public EntityOptions<TEntity> GetOrNull<TEntity>()
+        public AbpEntityOptions<TEntity> GetOrNull<TEntity>()
             where TEntity : IEntity
         {
-            return _options.GetOrDefault(typeof(TEntity)) as EntityOptions<TEntity>;
+            return _options.GetOrDefault(typeof(TEntity)) as AbpEntityOptions<TEntity>;
         }
 
-        public void Entity<TEntity>([NotNull] Action<EntityOptions<TEntity>> optionsAction)
+        public void Entity<TEntity>([NotNull] Action<AbpEntityOptions<TEntity>> optionsAction)
             where TEntity : IEntity
         {
             Check.NotNull(optionsAction, nameof(optionsAction));
@@ -37,8 +37,8 @@ namespace Volo.Abp.EntityFrameworkCore.DependencyInjection
             optionsAction(
                 _options.GetOrAdd(
                     typeof(TEntity),
-                    () => new EntityOptions<TEntity>()
-                ) as EntityOptions<TEntity>
+                    () => new AbpEntityOptions<TEntity>()
+                ) as AbpEntityOptions<TEntity>
             );
         }
     }
diff --git a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/IAbpDbContextRegistrationOptionsBuilder.cs b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/IAbpDbContextRegistrationOptionsBuilder.cs
index b2eb839944..daf1447f2e 100644
--- a/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/IAbpDbContextRegistrationOptionsBuilder.cs
+++ b/framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DependencyInjection/IAbpDbContextRegistrationOptionsBuilder.cs
@@ -7,7 +7,7 @@ namespace Volo.Abp.EntityFrameworkCore.DependencyInjection
 {
     public interface IAbpDbContextRegistrationOptionsBuilder : IAbpCommonDbContextRegistrationOptionsBuilder
     {
-        void Entity<TEntity>([NotNull] Action<EntityOptions<TEntity>> optionsAction)
+        void Entity<TEntity>([NotNull] Action<AbpEntityOptions<TEntity>> optionsAction)
             where TEntity : IEntity;
     }
 }
\ No newline at end of file
diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameModelBuilderConfigurationOptions.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameModelBuilderConfigurationOptions.cs
index 445cde72b5..8b3c2a49dd 100644
--- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameModelBuilderConfigurationOptions.cs
+++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameModelBuilderConfigurationOptions.cs
@@ -3,7 +3,7 @@ using Volo.Abp.EntityFrameworkCore.Modeling;
 
 namespace MyCompanyName.MyProjectName.EntityFrameworkCore
 {
-    public class MyProjectNameModelBuilderConfigurationOptions : ModelBuilderConfigurationOptions
+    public class MyProjectNameModelBuilderConfigurationOptions : AbpModelBuilderConfigurationOptions
     {
         public MyProjectNameModelBuilderConfigurationOptions(
             [NotNull] string tablePrefix = "",