Merge pull request #7816 from abpframework/maliming/ApplicationApiDes…

…criptionModel Use ApplicationApiDescriptionModel.Create insetad of new.
abpframework · Feb 24, 2021 · 490c967 · 490c967
2 parents 3df1322 + 105d7fd
commit 490c967
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/.../Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AspNetCoreApiDescriptionModelProvider.cs b/.../Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AspNetCoreApiDescriptionModelProvider.cs
@@ -84,7 +84,6 @@ public ApplicationApiDescriptionModel CreateApiModel(ApplicationApiDescriptionMo
             );
 
             var controllerModel = moduleModel.GetOrAddController(
-                controllerType.FullName,
                 _options.ControllerNameGenerator(controllerType, setting),
                 controllerType,
                 _modelOptions.IgnoredInterfaces

diff --git a/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/ApplicationApiDescriptionModel.cs b/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/ApplicationApiDescriptionModel.cs
@@ -43,7 +43,7 @@ public ModuleApiDescriptionModel GetOrAddModule(string rootPath, string remoteSe
 
         public ApplicationApiDescriptionModel CreateSubModel(string[] modules = null, string[] controllers = null, string[] actions = null)
         {
-            var subModel = new ApplicationApiDescriptionModel();
+            var subModel = ApplicationApiDescriptionModel.Create();;
 
             foreach (var module in Modules.Values)
             {

diff --git a/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/ModuleApiDescriptionModel.cs b/framework/src/Volo.Abp.Http/Volo/Abp/Http/Modeling/ModuleApiDescriptionModel.cs
@@ -41,17 +41,17 @@ public static ModuleApiDescriptionModel Create(string rootPath, string remoteSer
 
         public ControllerApiDescriptionModel AddController(ControllerApiDescriptionModel controller)
         {
-            if (Controllers.ContainsKey(controller.ControllerName))
+            if (Controllers.ContainsKey(controller.Type))
             {
-                throw new AbpException($"There is already a controller with name: {controller.ControllerName} in module: {RootPath}");
+                throw new AbpException($"There is already a controller with type: {controller.Type} in module: {RootPath}");
             }
 
-            return Controllers[controller.ControllerName] = controller;
+            return Controllers[controller.Type] = controller;
         }
 
-        public ControllerApiDescriptionModel GetOrAddController(string uniqueName, string name, Type type, [CanBeNull] HashSet<Type> ignoredInterfaces = null)
+        public ControllerApiDescriptionModel GetOrAddController(string name, Type type, [CanBeNull] HashSet<Type> ignoredInterfaces = null)
         {
-            return Controllers.GetOrAdd(uniqueName, () => ControllerApiDescriptionModel.Create(name, type, ignoredInterfaces));
+            return Controllers.GetOrAdd(type.FullName, () => ControllerApiDescriptionModel.Create(name, type, ignoredInterfaces));
         }
 
         public ModuleApiDescriptionModel CreateSubModel(string[] controllers, string[] actions)