#1397 Add polymorphism support to generated OpenAPI json and UI using Swashbuckle:

- Removed redundant changes;

Author: yecli

VirtoCommerce.Platform.Core/Common/AttributeExtensions.cs

@@ -21,22 +21,5 @@ public static string[] SplitString(this Attribute attribute, string original, ch
 
             return result;
         }
-
-        /// <summary>
-        /// Gets type attribute value https://stackoverflow.com/a/2656211/5907312
-        /// </summary>
-        /// <typeparam name="TAttribute">Attribute type</typeparam>
-        /// <typeparam name="TValue">Value type</typeparam>
-        /// <param name="type">Type for getting attribute</param>
-        /// <param name="valueSelector">Attribute value selector</param>
-        /// <returns>Attribute value</returns>
-        public static TValue GetAttributeValue<TAttribute, TValue>(
-            this Type type,
-            Func<TAttribute, TValue> valueSelector)
-            where TAttribute : Attribute
-        {
-            var att = type.GetCustomAttributes(typeof(TAttribute), true).FirstOrDefault() as TAttribute;
-            return (att != null) ? valueSelector(att) : default(TValue);
-        }
     }
 }

VirtoCommerce.Platform.Core/Modularity/ManifestModuleInfo.cs

@@ -62,13 +62,11 @@ public ManifestModuleInfo(ModuleManifest manifest)
                 Groups.AddRange(manifest.Groups);
             }
             Incompatibilities = new List<ModuleIdentity>();
-            if (manifest.Incompatibilities != null)
+            if(manifest.Incompatibilities != null)
             {
                 Incompatibilities.AddRange(manifest.Incompatibilities.Select(x => new ModuleIdentity(x.Id, x.Version)));
             }
 
-            OpenAPIPolymorphicTypes = manifest.OpenAPIPolymorphicTypes?.Select(x => x.Trim()) ?? Enumerable.Empty<string>();
-
             InitializationMode = InitializationMode.OnDemand;
         }
 
@@ -103,7 +101,6 @@ public ManifestModuleInfo(ModuleManifest manifest)
         public ICollection<ModuleSettingsGroup> Settings { get; private set; }
         public ICollection<string> Errors { get; set; }
         public bool UseFullTypeNameInSwagger { get; set; }
-        public IEnumerable<string> OpenAPIPolymorphicTypes { get; private set; }
 
         public override string ToString()
         {

VirtoCommerce.Platform.Core/Modularity/ModuleManifest.cs

@@ -88,9 +88,5 @@ public class ModuleManifest
 
         [XmlElement("useFullTypeNameInSwagger")]
         public bool UseFullTypeNameInSwagger { get; set; }
-
-        [XmlArray("openAPIPolymorphicTypes")]
-        [XmlArrayItem("assemblyQualifiedTypeName")]
-        public string[] OpenAPIPolymorphicTypes { get; set; }
     }
 }

VirtoCommerce.Platform.Data/Common/AssemblyExtensions.cs

@@ -2,15 +2,16 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace VirtoCommerce.Platform.Data.Common
 {
     public static class AssemblyExtensions
     {
         public static IEnumerable<Type> GetLoadableTypes(this Assembly assembly)
         {
-            if (assembly == null)
-                throw new ArgumentNullException("assembly");
+            if (assembly == null) throw new ArgumentNullException("assembly");
             try
             {
                 return assembly.GetTypes();
@@ -20,34 +21,5 @@ public static IEnumerable<Type> GetLoadableTypes(this Assembly assembly)
                 return e.Types.Where(t => t != null);
             }
         }
-
-        /// <summary>
-        /// Gets all assembly types with custom attribute specified.
-        /// </summary>
-        /// <param name="assembly">Assembly to get types</param>
-        /// <param name="customAttributeType">Custom attribute type to check</param>
-        /// <param name="inherited"></param>
-        /// <returns></returns>
-        public static IEnumerable<Type> GetTypesWithAttribute(this Assembly assembly, Type customAttributeType, bool inherited)
-        {
-            if (assembly == null)
-            {
-                throw new ArgumentNullException(nameof(assembly));
-            }
-
-            if (customAttributeType == null)
-            {
-                throw new ArgumentNullException(nameof(customAttributeType));
-            }
-
-            try
-            {
-                return assembly.GetTypes().Where(x => x.GetCustomAttributes(customAttributeType, inherited).Length > 0);
-            }
-            catch (ReflectionTypeLoadException e)
-            {
-                return e.Types.Where(x => x.GetCustomAttributes(customAttributeType, inherited).Length > 0);
-            }
-        }
     }
 }