Remove obsolete IValueConditionNodes and WithPriority() (#132)

* Removed obsolete IValueConditionNodes

* Refactored code

* Removed obsolete method WithPriority()

* Completed last commit

Author: jdromeiro

src/Rules.Framework.Providers.MongoDb/RuleFactory.cs

@@ -75,25 +75,17 @@ public RuleDataModel CreateRule(Rule<TContentType, TConditionType> rule)
             return ruleDataModel;
         }
 
-        private static ValueConditionNodeDataModel ConvertBooleanConditionNode(BooleanConditionNode<TConditionType> booleanConditionNode) => new ValueConditionNodeDataModel
-        {
-            ConditionType = Convert.ToString(booleanConditionNode.ConditionType, CultureInfo.InvariantCulture),
-            LogicalOperator = LogicalOperators.Eval,
-            DataType = booleanConditionNode.DataType,
-            Operand = booleanConditionNode.Operand,
-            Operator = booleanConditionNode.Operator,
-        };
-
-        private static IConditionNode<TConditionType> ConvertConditionNode(IConditionNodeBuilder<TConditionType> conditionNodeBuilder, ConditionNodeDataModel conditionNodeDataModel)
+        private static IConditionNode<TConditionType> ConvertConditionNode(
+            IConditionNodeBuilder<TConditionType> conditionNodeBuilder, ConditionNodeDataModel conditionNodeDataModel)
         {
             if (conditionNodeDataModel.LogicalOperator == LogicalOperators.Eval)
             {
                 return CreateValueConditionNode(conditionNodeBuilder, conditionNodeDataModel as ValueConditionNodeDataModel);
             }
 
-            ComposedConditionNodeDataModel composedConditionNodeDataModel = conditionNodeDataModel as ComposedConditionNodeDataModel;
+            var composedConditionNodeDataModel = conditionNodeDataModel as ComposedConditionNodeDataModel;
 
-            IComposedConditionNodeBuilder<TConditionType> composedConditionNodeBuilder = conditionNodeBuilder.AsComposed()
+            var composedConditionNodeBuilder = conditionNodeBuilder.AsComposed()
                 .WithLogicalOperator(composedConditionNodeDataModel.LogicalOperator);
 
             foreach (ConditionNodeDataModel child in composedConditionNodeDataModel.ChildConditionNodes)
@@ -104,33 +96,6 @@ private static IConditionNode<TConditionType> ConvertConditionNode(IConditionNod
             return composedConditionNodeBuilder.Build();
         }
 
-        private static ValueConditionNodeDataModel ConvertDecimalConditionNode(DecimalConditionNode<TConditionType> decimalConditionNode) => new ValueConditionNodeDataModel
-        {
-            ConditionType = Convert.ToString(decimalConditionNode.ConditionType, CultureInfo.InvariantCulture),
-            LogicalOperator = LogicalOperators.Eval,
-            DataType = decimalConditionNode.DataType,
-            Operand = decimalConditionNode.Operand,
-            Operator = decimalConditionNode.Operator,
-        };
-
-        private static ValueConditionNodeDataModel ConvertIntegerConditionNode(IntegerConditionNode<TConditionType> integerConditionNode) => new ValueConditionNodeDataModel
-        {
-            ConditionType = Convert.ToString(integerConditionNode.ConditionType, CultureInfo.InvariantCulture),
-            LogicalOperator = LogicalOperators.Eval,
-            DataType = integerConditionNode.DataType,
-            Operand = integerConditionNode.Operand,
-            Operator = integerConditionNode.Operator,
-        };
-
-        private static ValueConditionNodeDataModel ConvertStringConditionNode(StringConditionNode<TConditionType> stringConditionNode) => new ValueConditionNodeDataModel
-        {
-            ConditionType = Convert.ToString(stringConditionNode.ConditionType, CultureInfo.InvariantCulture),
-            LogicalOperator = LogicalOperators.Eval,
-            DataType = stringConditionNode.DataType,
-            Operand = stringConditionNode.Operand,
-            Operator = stringConditionNode.Operator,
-        };
-
         private static ValueConditionNodeDataModel ConvertValueConditionNode(ValueConditionNode<TConditionType> valueConditionNode) => new ValueConditionNodeDataModel
         {
             ConditionType = Convert.ToString(valueConditionNode.ConditionType, CultureInfo.InvariantCulture),
@@ -198,8 +163,9 @@ private static object Parse(string value, Type type)
 
         private ConditionNodeDataModel ConvertComposedConditionNode(ComposedConditionNode<TConditionType> composedConditionNode)
         {
-            List<ConditionNodeDataModel> conditionNodeDataModels = new List<ConditionNodeDataModel>(composedConditionNode.ChildConditionNodes.Count());
-            foreach (IConditionNode<TConditionType> child in composedConditionNode.ChildConditionNodes)
+            var conditionNodeDataModels = new List<ConditionNodeDataModel>(composedConditionNode.ChildConditionNodes.Count());
+
+            foreach (var child in composedConditionNode.ChildConditionNodes)
             {
                 conditionNodeDataModels.Add(this.ConvertConditionNode(child));
             }
@@ -215,19 +181,10 @@ private ConditionNodeDataModel ConvertConditionNode(IConditionNode<TConditionTyp
         {
             if (conditionNode.LogicalOperator == LogicalOperators.Eval)
             {
-                return conditionNode switch
-                {
-                    BooleanConditionNode<TConditionType> booleanConditionNode => ConvertBooleanConditionNode(booleanConditionNode),
-                    DecimalConditionNode<TConditionType> decimalConditionNode => ConvertDecimalConditionNode(decimalConditionNode),
-                    IntegerConditionNode<TConditionType> integerConditionNode => ConvertIntegerConditionNode(integerConditionNode),
-                    StringConditionNode<TConditionType> stringConditionNode => ConvertStringConditionNode(stringConditionNode),
-                    ValueConditionNode<TConditionType> valueConditionNode => ConvertValueConditionNode(valueConditionNode),
-                    _ => throw new NotSupportedException($"Unsupported value condition node type: {conditionNode.GetType().FullName}."),
-                };
+                return ConvertValueConditionNode(conditionNode as ValueConditionNode<TConditionType>);
             }
 
-            ComposedConditionNode<TConditionType> composedConditionNode = conditionNode as ComposedConditionNode<TConditionType>;
-            return ConvertComposedConditionNode(composedConditionNode);
+            return ConvertComposedConditionNode(conditionNode as ComposedConditionNode<TConditionType>);
         }
     }
 }

src/Rules.Framework/Builder/IRuleBuilder.cs

@@ -60,14 +60,5 @@ public interface IRuleBuilder<TContentType, TConditionType>
         /// <param name="name">The name.</param>
         /// <returns></returns>
         IRuleBuilder<TContentType, TConditionType> WithName(string name);
-
-        /// <summary>
-        /// Sets the new rule with the specified priority.
-        /// </summary>
-        /// <param name="priority">The priority.</param>
-        /// <returns></returns>
-        [Obsolete("This method is obsolete and will be removed on a future release. " +
-            "Please use RuleAddPriorityOption.ByPriorityNumber(number) instead if you are adding a new rule or use Priority property if updating.")]
-        IRuleBuilder<TContentType, TConditionType> WithPriority(int priority);
     }
 }

src/Rules.Framework/Builder/RuleBuilder.cs

@@ -82,14 +82,5 @@ public IRuleBuilder<TContentType, TConditionType> WithName(string name)
 
             return this;
         }
-
-        [Obsolete("This method is obsolete and will be removed on a future release. " +
-            "Please use RuleAddPriorityOption.ByPriorityNumber(number) instead if you are adding a new rule or use Priority property if updating.")]
-        public IRuleBuilder<TContentType, TConditionType> WithPriority(int priority)
-        {
-            this.priority = priority;
-
-            return this;
-        }
     }
 }

src/Rules.Framework/Core/ConditionNodes/BooleanConditionNode.cs

@@ -3,7 +3,9 @@ namespace Rules.Framework.Core.ConditionNodes
     /// <summary>
     /// Defines the interface contract for a condition node based on a value comparison.
     /// </summary>
-    /// <typeparam name="TConditionType">The condition type that allows to filter rules based on a set of conditions.</typeparam>
+    /// <typeparam name="TConditionType">
+    /// The condition type that allows to filter rules based on a set of conditions.
+    /// </typeparam>
     public interface IValueConditionNode<TConditionType> : IConditionNode<TConditionType>
     {
         /// <summary>
@@ -16,6 +18,11 @@ public interface IValueConditionNode<TConditionType> : IConditionNode<TCondition
         /// </summary>
         DataTypes DataType { get; }
 
+        /// <summary>
+        /// Gets the condition's operand.
+        /// </summary>
+        public object Operand { get; }
+
         /// <summary>
         /// Gets the condition node operator.
         /// </summary>