Merge branch 'develop' of https://github.com/nopSolutions/nopCommerce into develop

Author: skoshelev

src/Libraries/Nop.Core/Caching/MemoryCacheManager.cs

@@ -15,14 +15,14 @@ public partial class MemoryCacheManager : ILocker, IStaticCacheManager
     {
         #region Fields
 
+        private readonly IMemoryCache _cache;
+
         /// <summary>
         /// All keys of cache
         /// </summary>
         /// <remarks>Dictionary value indicating whether a key still exists in cache</remarks> 
         protected static readonly ConcurrentDictionary<string, bool> _allKeys;
 
-        private readonly IMemoryCache _cache;
-
         /// <summary>
         /// Cancellation token for clear cache
         /// </summary>
@@ -32,18 +32,11 @@ public partial class MemoryCacheManager : ILocker, IStaticCacheManager
 
         #region Ctor
 
-        /// <summary>
-        /// Ctor
-        /// </summary>
         static MemoryCacheManager()
         {
             _allKeys = new ConcurrentDictionary<string, bool>();
         }
 
-        /// <summary>
-        /// Ctor
-        /// </summary>
-        /// <param name="cache">Cache</param>
         public MemoryCacheManager(IMemoryCache cache)
         {
             _cache = cache;
@@ -140,7 +133,7 @@ private void PostEviction(object key, object value, EvictionReason reason, objec
         #endregion
 
         #region Methods
-        
+
         /// <summary>
         /// Get a cached item. If it's not in the cache yet, then load and cache it
         /// </summary>

src/Libraries/Nop.Core/Caching/PerRequestCacheManager.cs

@@ -19,9 +19,6 @@ public partial class PerRequestCacheManager : ICacheManager
 
         #region Ctor
 
-        /// <summary>
-        /// Gets a key/value collection that can be used to share data within the scope of this request 
-        /// </summary>
         public PerRequestCacheManager(IHttpContextAccessor httpContextAccessor)
         {
             this._httpContextAccessor = httpContextAccessor;
@@ -56,7 +53,7 @@ public virtual T Get<T>(string key, Func<T> acquire, int? cacheTime = null)
             var items = GetItems();
             if (items == null)
                 return acquire();
-                        
+
             //item already is in cache, so return it
             if (items[key] != null)
                 return (T)items[key];
@@ -151,4 +148,4 @@ public virtual void Dispose()
 
         #endregion
     }
-}
+}

src/Libraries/Nop.Core/Caching/RedisCacheManager.cs

@@ -17,20 +17,15 @@ public partial class RedisCacheManager : IStaticCacheManager
 
         private readonly ICacheManager _perRequestCacheManager;
         private readonly IRedisConnectionWrapper _connectionWrapper;
+
         private readonly IDatabase _db;
 
         #endregion
 
         #region Ctor
 
-        /// <summary>
-        /// Ctor
-        /// </summary>
-        /// <param name="perRequestCacheManager">Cache manager</param>
-        /// <param name="connectionWrapper">ConnectionW wrapper</param>
-        /// <param name="config">Config</param>
         public RedisCacheManager(ICacheManager perRequestCacheManager,
-            IRedisConnectionWrapper connectionWrapper, 
+            IRedisConnectionWrapper connectionWrapper,
             NopConfig config)
         {
             if (string.IsNullOrEmpty(config.RedisCachingConnectionString))

src/Libraries/Nop.Core/Caching/RedisConnectionWrapper.cs

@@ -16,19 +16,16 @@ public class RedisConnectionWrapper : IRedisConnectionWrapper, ILocker
         #region Fields
 
         private readonly NopConfig _config;
-        private readonly Lazy<string> _connectionString;
+
         private readonly object _lock = new object();
         private volatile ConnectionMultiplexer _connection;
+        private readonly Lazy<string> _connectionString;
         private volatile RedLockFactory _redisLockFactory;
 
         #endregion
 
         #region Ctor
 
-        /// <summary>
-        /// Ctor
-        /// </summary>
-        /// <param name="config">Config</param>
         public RedisConnectionWrapper(NopConfig config)
         {
             this._config = config;

src/Libraries/Nop.Core/ComponentModel/GenericDictionaryTypeConverter.cs

@@ -23,9 +23,6 @@ public class GenericDictionaryTypeConverter<K, V> : TypeConverter
         /// </summary>
         protected readonly TypeConverter typeConverterValue;
 
-        /// <summary>
-        /// Ctor
-        /// </summary>
         public GenericDictionaryTypeConverter()
         {
             typeConverterKey = TypeDescriptor.GetConverter(typeof(K));
@@ -61,7 +58,7 @@ public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceT
         /// <returns>Result</returns>
         public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
         {
-            if (!(value is string)) 
+            if (!(value is string))
                 return base.ConvertFrom(context, culture, value);
 
             var input = (string)value;
@@ -71,12 +68,12 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
             Array.ForEach(items, s =>
             {
                 var keyValueStr = string.IsNullOrEmpty(s) ? new string[0] : s.Split(',').Select(x => x.Trim()).ToArray();
-                if (keyValueStr.Length != 2) 
+                if (keyValueStr.Length != 2)
                     return;
 
                 object dictionaryKey = (K)typeConverterKey.ConvertFromInvariantString(keyValueStr[0]);
                 object dictionaryValue = (V)typeConverterValue.ConvertFromInvariantString(keyValueStr[1]);
-                if (dictionaryKey == null || dictionaryValue == null) 
+                if (dictionaryKey == null || dictionaryValue == null)
                     return;
 
                 if (!result.ContainsKey((K)dictionaryKey))
@@ -96,11 +93,11 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
         /// <returns>Result</returns>
         public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)
         {
-            if (destinationType != typeof(string)) 
+            if (destinationType != typeof(string))
                 return base.ConvertTo(context, culture, value, destinationType);
 
             var result = string.Empty;
-            if (value == null) 
+            if (value == null)
                 return result;
 
             //we don't use string.Join() because it doesn't support invariant culture
@@ -118,4 +115,4 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul
             return result;
         }
     }
-}
+}

src/Libraries/Nop.Core/ComponentModel/GenericListTypeConverter.cs

@@ -17,9 +17,6 @@ public class GenericListTypeConverter<T> : TypeConverter
         /// </summary>
         protected readonly TypeConverter typeConverter;
 
-        /// <summary>
-        /// Ctor
-        /// </summary>
         public GenericListTypeConverter()
         {
             typeConverter = TypeDescriptor.GetConverter(typeof(T));
@@ -47,7 +44,7 @@ protected virtual string[] GetStringArray(string input)
         /// <returns>Result</returns>
         public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
         {
-            if (sourceType != typeof(string)) 
+            if (sourceType != typeof(string))
                 return base.CanConvertFrom(context, sourceType);
 
             var items = GetStringArray(sourceType.ToString());
@@ -63,7 +60,7 @@ public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceT
         /// <returns>Result</returns>
         public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
         {
-            if (!(value is string)) 
+            if (!(value is string))
                 return base.ConvertFrom(context, culture, value);
 
             var items = GetStringArray((string)value);
@@ -94,7 +91,7 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul
                 return base.ConvertTo(context, culture, value, destinationType);
 
             var result = string.Empty;
-            if (value == null) 
+            if (value == null)
                 return result;
 
             //we don't use string.Join() because it doesn't support invariant culture
@@ -110,4 +107,4 @@ public override object ConvertTo(ITypeDescriptorContext context, CultureInfo cul
             return result;
         }
     }
-}
+}

src/Libraries/Nop.Core/Domain/Catalog/CatalogSettings.cs

@@ -8,9 +8,6 @@ namespace Nop.Core.Domain.Catalog
     /// </summary>
     public class CatalogSettings : ISettings
     {
-        /// <summary>
-        /// Ctor
-        /// </summary>
         public CatalogSettings()
         {
             ProductSortingEnumDisabled = new List<int>();

src/Libraries/Nop.Core/Domain/Cms/WidgetSettings.cs

@@ -8,9 +8,6 @@ namespace Nop.Core.Domain.Cms
     /// </summary>
     public class WidgetSettings : ISettings
     {
-        /// <summary>
-        /// Ctor
-        /// </summary>
         public WidgetSettings()
         {
             ActiveWidgetSystemNames = new List<string>();

src/Libraries/Nop.Core/Domain/Common/CommonSettings.cs

@@ -8,9 +8,6 @@ namespace Nop.Core.Domain.Common
     /// </summary>
     public class CommonSettings : ISettings
     {
-        /// <summary>
-        /// Ctor
-        /// </summary>
         public CommonSettings()
         {
             SitemapCustomUrls = new List<string>();

src/Libraries/Nop.Core/Domain/Configuration/Setting.cs

@@ -7,9 +7,6 @@ namespace Nop.Core.Domain.Configuration
     /// </summary>
     public partial class Setting : BaseEntity, ILocalizedEntity
     {
-        /// <summary>
-        /// Ctor
-        /// </summary>
         public Setting()
         {
         }
@@ -20,13 +17,13 @@ public Setting()
         /// <param name="name">Name</param>
         /// <param name="value">Value</param>
         /// <param name="storeId">Store identifier</param>
-        public Setting(string name, string value, int storeId = 0) 
+        public Setting(string name, string value, int storeId = 0)
         {
             this.Name = name;
             this.Value = value;
             this.StoreId = storeId;
         }
-        
+
         /// <summary>
         /// Gets or sets the name
         /// </summary>
@@ -51,4 +48,4 @@ public override string ToString()
             return Name;
         }
     }
-}
+}