Added validation and type for features.

framework/src/Volo.Abp.Features/Volo.Abp.Features.csproj

@@ -16,6 +16,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Volo.Abp.Localization.Abstractions\Volo.Abp.Localization.Abstractions.csproj" />
     <ProjectReference Include="..\Volo.Abp.MultiTenancy.Abstractions\Volo.Abp.MultiTenancy.Abstractions.csproj" />
+    <ProjectReference Include="..\Volo.Abp.Validation\Volo.Abp.Validation.csproj" />
   </ItemGroup>
 
 </Project>

framework/src/Volo.Abp.Features/Volo/Abp/Features/AbpFeaturesModule.cs

@@ -4,12 +4,14 @@ using System.Collections.Generic;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
 using Volo.Abp.MultiTenancy;
+using Volo.Abp.Validation;
 
 namespace Volo.Abp.Features
 {
     [DependsOn(
         typeof(AbpLocalizationAbstractionsModule),
-        typeof(AbpMultiTenancyAbstractionsModule)
+        typeof(AbpMultiTenancyAbstractionsModule),
+        typeof(AbpValidationModule)
         )]
     public class AbpFeaturesModule : AbpModule
     {

framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureDefinition.cs

@@ -3,6 +3,7 @@ using System.Collections.Immutable;
 using System.Linq;
 using JetBrains.Annotations;
 using Volo.Abp.Localization;
+using Volo.Abp.Validation.StringValues;
 
 namespace Volo.Abp.Features
 {
@@ -29,6 +30,7 @@ namespace Volo.Abp.Features
         /// Parent of this feature, if one exists.
         /// If set, this feature can be enabled only if the parent is enabled.
         /// </summary>
+        [CanBeNull]
         public FeatureDefinition Parent { get; private set; }
 
         /// <summary>
@@ -53,6 +55,7 @@ namespace Volo.Abp.Features
         /// A list of allowed providers to get/set value of this feature.
         /// An empty list indicates that all providers are allowed.
         /// </summary>
+        [NotNull]
         public List<string> AllowedProviders { get; }
 
         /// <summary>
@@ -63,6 +66,7 @@ namespace Volo.Abp.Features
         /// Returns the value in the <see cref="Properties"/> dictionary by given <see cref="name"/>.
         /// Returns null if given <see cref="name"/> is not present in the <see cref="Properties"/> dictionary.
         /// </returns>
+        [CanBeNull]
         public object this[string name]
         {
             get => Properties.GetOrDefault(name);
@@ -75,20 +79,28 @@ namespace Volo.Abp.Features
         [NotNull]
         public Dictionary<string, object> Properties { get; }
 
-        //TODO: Implement input type like old ABP!
+        /// <summary>
+        /// Input type.
+        /// This can be used to prepare an input for changing this feature's value.
+        /// Default: <see cref="ToggleStringValueType"/>.
+        /// </summary>
+        [CanBeNull]
+        public IStringValueType ValueType { get; set; }
 
         public FeatureDefinition(
             string name,
             string defaultValue = null,
             ILocalizableString displayName = null,
             ILocalizableString description = null,
+            IStringValueType valueType = null,
             bool isVisibleToClients = true)
         {
             Name = name;
             DefaultValue = defaultValue;
-            IsVisibleToClients = isVisibleToClients;
             DisplayName = displayName ?? new FixedLocalizableString(name);
             Description = description;
+            ValueType = valueType;
+            IsVisibleToClients = isVisibleToClients;
 
             Properties = new Dictionary<string, object>();
             AllowedProviders = new List<string>();
@@ -128,13 +140,15 @@ namespace Volo.Abp.Features
             string defaultValue = null, 
             ILocalizableString displayName = null, 
             ILocalizableString description = null,
+            IStringValueType valueType = null,
             bool isVisibleToClients = true)
         {
             var feature = new FeatureDefinition(
                 name, 
                 defaultValue, 
                 displayName, 
-                description, 
+                description,
+                valueType,
                 isVisibleToClients)
             {
                 Parent = this

framework/src/Volo.Abp.Features/Volo/Abp/Features/FeatureGroupDefinition.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using Volo.Abp.Localization;
+using Volo.Abp.Validation.StringValues;
 
 namespace Volo.Abp.Features
 {
@@ -53,6 +54,7 @@ namespace Volo.Abp.Features
             string defaultValue = null,
             ILocalizableString displayName = null,
             ILocalizableString description = null,
+            IStringValueType valueType = null,
             bool isVisibleToClients = true)
         {
             var feature = new FeatureDefinition(
@@ -60,6 +62,7 @@ namespace Volo.Abp.Features
                 defaultValue,
                 displayName,
                 description,
+                valueType,
                 isVisibleToClients
             );
 

framework/src/Volo.Abp.Validation/Volo/Abp/Validation/StringValues/AlwaysValidValueValidator.cs

@@ -0,0 +1,14 @@
+using System;
+
+namespace Volo.Abp.Validation.StringValues
+{
+    [Serializable]
+    [ValueValidator("NULL")]
+    public class AlwaysValidValueValidator : ValueValidatorBase
+    {
+        public override bool IsValid(object value)
+        {
+            return true;
+        }
+    }
+}

framework/src/Volo.Abp.Validation/Volo/Abp/Validation/StringValues/BooleanValueValidator.cs

@@ -0,0 +1,24 @@
+using System;
+
+namespace Volo.Abp.Validation.StringValues
+{
+    [Serializable]
+    [ValueValidator("BOOLEAN")]
+    public class BooleanValueValidator : ValueValidatorBase
+    {
+        public override bool IsValid(object value)
+        {
+            if (value == null)
+            {
+                return false;
+            }
+
+            if (value is bool)
+            {
+                return true;
+            }
+
+            return bool.TryParse(value.ToString(), out _);
+        }
+    }
+}

framework/src/Volo.Abp.Validation/Volo/Abp/Validation/StringValues/FreeTextStringValueType.cs

@@ -0,0 +1,19 @@
+using System;
+
+namespace Volo.Abp.Validation.StringValues
+{
+    [Serializable]
+    [StringValueType("FREE_TEXT")]
+    public class FreeTextStringValueType : StringValueTypeBase
+    {
+        public FreeTextStringValueType()
+        {
+
+        }
+
+        public FreeTextStringValueType(IValueValidator validator)
+            : base(validator)
+        {
+        }
+    }
+}

framework/src/Volo.Abp.Validation/Volo/Abp/Validation/StringValues/ISelectionStringValueItem.cs

@@ -0,0 +1,9 @@
+namespace Volo.Abp.Validation.StringValues
+{
+    public interface ISelectionStringValueItem
+    {
+        string Value { get; set; }
+
+        LocalizableStringInfo DisplayText { get; set; }
+    }
+}

framework/src/Volo.Abp.Validation/Volo/Abp/Validation/StringValues/ISelectionStringValueItemSource.cs

@@ -0,0 +1,9 @@
+using System.Collections.Generic;
+
+namespace Volo.Abp.Validation.StringValues
+{
+    public interface ISelectionStringValueItemSource
+    {
+        ICollection<ISelectionStringValueItem> Items { get; }
+    }
+}

framework/src/Volo.Abp.Validation/Volo/Abp/Validation/StringValues/IStringValueType.cs

@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using JetBrains.Annotations;
+
+namespace Volo.Abp.Validation.StringValues
+{
+    public interface IStringValueType
+    {
+        string Name { get; }
+
+        [CanBeNull]
+        object this[string key] { get; set; }
+
+        [NotNull]
+        Dictionary<string, object> Properties { get; }
+
+        IValueValidator Validator { get; set; }
+    }
+}

framework/src/Volo.Abp.Validation/Volo/Abp/Validation/StringValues/IValueValidator.cs

@@ -0,0 +1,18 @@
+using System.Collections.Generic;
+using JetBrains.Annotations;
+
+namespace Volo.Abp.Validation.StringValues
+{
+    public interface IValueValidator
+    {
+        string Name { get; }
+
+        [CanBeNull]
+        object this[string key] { get; set; }
+
+        [NotNull]
+        IDictionary<string, object> Properties { get; }
+
+        bool IsValid(object value);
+    }
+}

framework/src/Volo.Abp.Validation/Volo/Abp/Validation/StringValues/LocalizableSelectionStringValueItem.cs

@@ -0,0 +1,9 @@
+namespace Volo.Abp.Validation.StringValues
+{
+    public class LocalizableSelectionStringValueItem : ISelectionStringValueItem
+    {
+        public string Value { get; set; }
+
+        public LocalizableStringInfo DisplayText { get; set; }
+    }
+}

framework/src/Volo.Abp.Validation/Volo/Abp/Validation/StringValues/LocalizableStringInfo.cs

@@ -0,0 +1,15 @@
+namespace Volo.Abp.Validation.StringValues
+{
+    public class LocalizableStringInfo
+    {
+        public string ResourceName { get; }
+
+        public string Name { get; }
+
+        public LocalizableStringInfo(string resourceName, string name)
+        {
+            ResourceName = resourceName;
+            Name = name;
+        }
+    }
+}

framework/src/Volo.Abp.Validation/Volo/Abp/Validation/StringValues/NumericValueValidator.cs

@@ -0,0 +1,61 @@
+using System;
+
+namespace Volo.Abp.Validation.StringValues
+{
+    [Serializable]
+    [ValueValidator("NUMERIC")]
+    public class NumericValueValidator : ValueValidatorBase
+    {
+        public int MinValue
+        {
+            get => (this["MinValue"] ?? "0").To<int>();
+            set => this["MinValue"] = value;
+        }
+
+        public int MaxValue
+        {
+            get => (this["MaxValue"] ?? "0").To<int>();
+            set => this["MaxValue"] = value;
+        }
+
+        public NumericValueValidator()
+        {
+
+        }
+
+        public NumericValueValidator(int minValue = int.MinValue, int maxValue = int.MaxValue)
+        {
+            MinValue = minValue;
+            MaxValue = maxValue;
+        }
+
+        public override bool IsValid(object value)
+        {
+            if (value == null)
+            {
+                return false;
+            }
+
+            if (value is int)
+            {
+                return IsValidInternal((int)value);
+            }
+
+            if (value is string)
+            {
+                int intValue;
+                if (int.TryParse(value as string, out intValue))
+                {
+                    return IsValidInternal(intValue);
+                }
+            }
+
+            return false;
+        }
+
+        protected virtual bool IsValidInternal(int value)
+        {
+            return value.IsBetween(MinValue, MaxValue);
+        }
+    }
+}

framework/src/Volo.Abp.Validation/Volo/Abp/Validation/StringValues/SelectionStringValueType.cs

@@ -0,0 +1,22 @@
+using System;
+
+namespace Volo.Abp.Validation.StringValues
+{
+    [Serializable]
+    [StringValueType("SELECTION")]
+    public class SelectionStringValueType : StringValueTypeBase
+    {
+        public ISelectionStringValueItemSource ItemSource { get; set; }
+
+        public SelectionStringValueType()
+        {
+
+        }
+
+        public SelectionStringValueType(IValueValidator validator)
+            : base(validator)
+        {
+
+        }
+    }
+}

framework/src/Volo.Abp.Validation/Volo/Abp/Validation/StringValues/StaticSelectionStringValueItemSource.cs

@@ -0,0 +1,14 @@
+using System.Collections.Generic;
+
+namespace Volo.Abp.Validation.StringValues
+{
+    public class StaticSelectionStringValueItemSource : ISelectionStringValueItemSource
+    {
+        public ICollection<ISelectionStringValueItem> Items { get; }
+
+        public StaticSelectionStringValueItemSource(params ISelectionStringValueItem[] items)
+        {
+            Items = Check.NotNullOrEmpty(items, nameof(items));
+        }
+    }
+}

framework/src/Volo.Abp.Validation/Volo/Abp/Validation/StringValues/StringValueTypeAttribute.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Linq;
+using System.Reflection;
+
+namespace Volo.Abp.Validation.StringValues
+{
+    [AttributeUsage(AttributeTargets.Class)]
+    public class StringValueTypeAttribute : Attribute
+    {
+        public string Name { get; set; }
+
+        public StringValueTypeAttribute(string name)
+        {
+            Name = name;
+        }
+
+        public static string GetName(Type type)
+        {
+            if (type.IsDefined(typeof(StringValueTypeAttribute)))
+            {
+                return type.GetCustomAttributes(typeof(StringValueTypeAttribute)).Cast<StringValueTypeAttribute>().First().Name;
+            }
+
+            return type.Name;
+        }
+    }
+}

framework/src/Volo.Abp.Validation/Volo/Abp/Validation/StringValues/StringValueTypeBase.cs

@@ -0,0 +1,31 @@
+using System.Collections.Generic;
+
+namespace Volo.Abp.Validation.StringValues
+{
+    public abstract class StringValueTypeBase : IStringValueType
+    {
+        public virtual string Name => ValueValidatorAttribute.GetName(GetType());
+
+        public object this[string key]
+        {
+            get => Properties.GetOrDefault(key);
+            set => Properties[key] = value;
+        }
+
+        public Dictionary<string, object> Properties { get; }
+
+        public IValueValidator Validator { get; set; }
+
+        protected StringValueTypeBase()
+            : this(new AlwaysValidValueValidator())
+        {
+
+        }
+
+        protected StringValueTypeBase(IValueValidator validator)
+        {
+            Validator = validator;
+            Properties = new Dictionary<string, object>();
+        }
+    }
+}

framework/src/Volo.Abp.Validation/Volo/Abp/Validation/StringValues/StringValueValidator.cs

@@ -0,0 +1,79 @@
+using System;
+using System.Text.RegularExpressions;
+
+namespace Volo.Abp.Validation.StringValues
+{
+    [Serializable]
+    [ValueValidator("STRING")]
+    public class StringValueValidator : ValueValidatorBase
+    {
+        public bool AllowNull
+        {
+            get => (this["AllowNull"] ?? "false").To<bool>();
+            set => this["AllowNull"] = value.ToString().ToLowerInvariant();
+        }
+
+        public int MinLength
+        {
+            get => (this["MinLength"] ?? "0").To<int>();
+            set => this["MinLength"] = value;
+        }
+
+        public int MaxLength
+        {
+            get => (this["MaxLength"] ?? "0").To<int>();
+            set => this["MaxLength"] = value;
+        }
+
+        public string RegularExpression
+        {
+            get => this["RegularExpression"] as string;
+            set => this["RegularExpression"] = value;
+        }
+
+        public StringValueValidator()
+        {
+            
+        }
+
+        public StringValueValidator(int minLength = 0, int maxLength = 0, string regularExpression = null, bool allowNull = false)
+        {
+            MinLength = minLength;
+            MaxLength = maxLength;
+            RegularExpression = regularExpression;
+            AllowNull = allowNull;
+        }
+
+        public override bool IsValid(object value)
+        {
+            if (value == null)
+            {
+                return AllowNull;
+            }
+
+            if (!(value is string))
+            {
+                return false;
+            }
+
+            var strValue = value as string;
+            
+            if (MinLength > 0 && strValue.Length < MinLength)
+            {
+                return false;
+            }
+
+            if (MaxLength > 0 && strValue.Length > MaxLength)
+            {
+                return false;
+            }
+
+            if (!RegularExpression.IsNullOrEmpty())
+            {
+                return Regex.IsMatch(strValue, RegularExpression);
+            }
+
+            return true;
+        }
+    }
+}

framework/src/Volo.Abp.Validation/Volo/Abp/Validation/StringValues/ToggleStringValueType.cs

@@ -0,0 +1,21 @@
+using System;
+
+namespace Volo.Abp.Validation.StringValues
+{
+    [Serializable]
+    [StringValueType("TOGGLE")]
+    public class ToggleStringValueType : StringValueTypeBase
+    {
+        public ToggleStringValueType()
+            : this(new BooleanValueValidator())
+        {
+
+        }
+
+        public ToggleStringValueType(IValueValidator validator)
+            : base(validator)
+        {
+
+        }
+    }
+}

framework/src/Volo.Abp.Validation/Volo/Abp/Validation/StringValues/ValueValidatorAttribute.cs

@@ -0,0 +1,27 @@
+using System;
+using System.Linq;
+using System.Reflection;
+
+namespace Volo.Abp.Validation.StringValues
+{
+    [AttributeUsage(AttributeTargets.Class)]
+    public class ValueValidatorAttribute : Attribute
+    {
+        public string Name { get; set; }
+
+        public ValueValidatorAttribute(string name)
+        {
+            Name = name;
+        }
+
+        public static string GetName(Type type)
+        {
+            if (type.IsDefined(typeof(ValueValidatorAttribute)))
+            {
+                return type.GetCustomAttributes(typeof(ValueValidatorAttribute)).Cast<ValueValidatorAttribute>().First().Name;
+            }
+
+            return type.Name;
+        }
+    }
+}

framework/src/Volo.Abp.Validation/Volo/Abp/Validation/StringValues/ValueValidatorBase.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+
+namespace Volo.Abp.Validation.StringValues
+{
+    [Serializable]
+    public abstract class ValueValidatorBase : IValueValidator
+    {
+        public virtual string Name => ValueValidatorAttribute.GetName(GetType());
+
+        public object this[string key]
+        {
+            get => Properties.GetOrDefault(key);
+            set => Properties[key] = value;
+        }
+
+        public IDictionary<string, object> Properties { get; }
+
+        protected ValueValidatorBase()
+        {
+            Properties = new Dictionary<string, object>();
+        }
+
+        public abstract bool IsValid(object value);
+    }
+}