From 53216526d473f93f296ebec2b8cd516aad70848b Mon Sep 17 00:00:00 2001
From: Yunus Emre Kalkan <emre.kalkan@volosoft.com>
Date: Tue, 15 Oct 2019 16:01:47 +0300
Subject: [PATCH] ConventionalControllerOptions to
 AbpConventionalControllerOptions

---
 .../Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcOptions.cs      | 4 ++--
 ...rollerOptions.cs => AbpConventionalControllerOptions.cs} | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/{ConventionalControllerOptions.cs => AbpConventionalControllerOptions.cs} (78%)

diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcOptions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcOptions.cs
index 6dec2fde14..fb29e17496 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcOptions.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcOptions.cs
@@ -4,11 +4,11 @@ namespace Volo.Abp.AspNetCore.Mvc
 {
     public class AbpAspNetCoreMvcOptions
     {
-        public ConventionalControllerOptions ConventionalControllers { get; }
+        public AbpConventionalControllerOptions ConventionalControllers { get; }
 
         public AbpAspNetCoreMvcOptions()
         {
-            ConventionalControllers = new ConventionalControllerOptions();
+            ConventionalControllers = new AbpConventionalControllerOptions();
         }
     }
 }
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/ConventionalControllerOptions.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/AbpConventionalControllerOptions.cs
similarity index 78%
rename from framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/ConventionalControllerOptions.cs
rename to framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/AbpConventionalControllerOptions.cs
index a574716ef1..e28ff37717 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/ConventionalControllerOptions.cs
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/Conventions/AbpConventionalControllerOptions.cs
@@ -7,13 +7,13 @@ using Volo.Abp.Http.Modeling;
 
 namespace Volo.Abp.AspNetCore.Mvc.Conventions
 {
-    public class ConventionalControllerOptions
+    public class AbpConventionalControllerOptions
     {
         public ConventionalControllerSettingList ConventionalControllerSettings { get; }
 
         public List<Type> FormBodyBindingIgnoredTypes { get; }
         
-        public ConventionalControllerOptions()
+        public AbpConventionalControllerOptions()
         {
             ConventionalControllerSettings = new ConventionalControllerSettingList();
 
@@ -23,7 +23,7 @@ namespace Volo.Abp.AspNetCore.Mvc.Conventions
             };
         }
 
-        public ConventionalControllerOptions Create(Assembly assembly, [CanBeNull] Action<ConventionalControllerSetting> optionsAction = null)
+        public AbpConventionalControllerOptions Create(Assembly assembly, [CanBeNull] Action<ConventionalControllerSetting> optionsAction = null)
         {
             var setting = new ConventionalControllerSetting(assembly, ModuleApiDescriptionModel.DefaultRootPath);
             optionsAction?.Invoke(setting);