Refactor

Author: hbulens

README.md

@@ -1,6 +1,6 @@
 # Dime.Ext
 
-[![Build Status](https://dev.azure.com/dimenicsbe/Utilities/_apis/build/status/Ext%20-%20MAIN%20-%20CI?branchName=master)](https://dev.azure.com/dimenicsbe/Utilities/_build/latest?definitionId=66&branchName=master)
+[![Build Status](https://dev.azure.com/dimenicsbe/Utilities/_apis/build/status/Ext%20-%20MAIN%20-%20CI?branchName=master)](https://dev.azure.com/dimenicsbe/Utilities/_build/latest?definitionId=66&branchName=master) [![Dime.ExtJs package in Dime.Scheduler feed in Azure Artifacts](https://feeds.dev.azure.com/dimenicsbe/_apis/public/Packaging/Feeds/a7b896fd-9cd8-4291-afe1-f223483d87f0/Packages/07e6d457-5eb4-4a37-888b-e01c31169065/Badge)](https://dev.azure.com/dimenicsbe/Utilities/_packaging?_a=package&feed=a7b896fd-9cd8-4291-afe1-f223483d87f0&package=07e6d457-5eb4-4a37-888b-e01c31169065&preferRelease=true)
 
 ## Introduction
 
@@ -46,4 +46,4 @@ Please make sure to update tests as appropriate.
 
 ## License
 
-MIT
+[![License](http://img.shields.io/:license-mit-blue.svg?style=flat-square)](http://badges.mit-license.org)

src/core/Action.cs

@@ -5,19 +5,13 @@
     /// </summary>
     public abstract class Action
     {
-        #region Constructor
-
         /// <summary>
         /// Initializes a new instance of the <see cref="Action"/> class
         /// </summary>
-        public Action()
+        protected Action()
         {
         }
 
-        #endregion Constructor
-
-        #region Properties
-
         /// <summary>
         /// Gets or sets the property on which the action to invoke
         /// </summary>
@@ -43,7 +37,5 @@ public Action()
         /// Gets or sets the name of the complex type
         /// </summary>
         public string ComplexTypeName { get; set; }
-
-        #endregion Properties
     }
 }

src/core/AdvancedFilter.cs

@@ -5,19 +5,13 @@
     /// </summary>
     public class AdvancedFilter : Filter
     {
-        #region Constructor
-
         /// <summary>
         /// Initializes a new instance of the <see cref="AdvancedFilter"/> class
         /// </summary>
         public AdvancedFilter() : base()
         {
         }
 
-        #endregion Constructor
-
-        #region Properties
-
         /// <summary>
         /// Gets or sets the group key to which this filter belongs
         /// </summary>
@@ -32,7 +26,5 @@ public AdvancedFilter() : base()
         /// Gets or sets the flag to indicate whether the filter is 'AND' or 'OR'
         /// </summary>
         public override bool And => Condition != "OR";
-
-        #endregion Properties
     }
 }

src/core/Dime.ExtJs.csproj

@@ -17,20 +17,21 @@
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.1.1</Version>
+    <Version>1.1.2</Version>
     <Description>.NET classes for ExtJS operations such as grouping, sorting and filtering</Description>
     <Copyright>Copyright © 2020</Copyright>
     <NeutralLanguage>en</NeutralLanguage>
     <IncludeSource>True</IncludeSource>
     <IncludeSymbols>True</IncludeSymbols>
     <RootNamespace>Dime.ExtJs</RootNamespace>
-    <AssemblyVersion>1.1.1.0</AssemblyVersion>
+    <AssemblyVersion>1.1.2.0</AssemblyVersion>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <RepositoryType>git</RepositoryType>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
-    <PackageReference Include="System.Runtime" Version="4.3.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="System.Runtime" Version="4.3.1" />
     <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
   </ItemGroup>
 

src/core/Filter.cs

@@ -10,8 +10,6 @@ namespace Dime.ExtJs
     [DebuggerDisplay("{Property} - {Value}")]
     public class Filter : IFilter
     {
-        #region Constructor
-
         /// <summary>
         /// Initializes a new instance of the <see cref="Filter"/> class
         /// </summary>
@@ -20,10 +18,6 @@ public Filter()
             And = true;
         }
 
-        #endregion Constructor
-
-        #region Properties
-
         /// <summary>
         /// Gets or sets the property name
         /// </summary>
@@ -44,10 +38,6 @@ public Filter()
         /// </summary>
         public virtual bool And { get; set; }
 
-        #endregion Properties
-
-        #region Methods
-
         /// <summary>
         /// Checks whether the filter needs to be done on an associated model
         /// </summary>
@@ -58,9 +48,6 @@ public Filter()
         ///
         /// </summary>
         /// <returns></returns>
-        /// <history>
-        /// [HB] 03/11/2016 - Refactor into filter class
-        /// </history>
         public IDictionary<int, string> GetFields()
         {
             int c = 1;
@@ -73,7 +60,5 @@ public IDictionary<int, string> GetFields()
 
             return properties;
         }
-
-        #endregion Methods
     }
 }

src/core/Group.cs

@@ -7,35 +7,23 @@ namespace Dime.ExtJs
     /// </summary>
     public class Group : Action
     {
-        #region Constructor
-
         /// <summary>
         /// Initializes a new instance of the <see cref="Group"/> class
         /// </summary>
         public Group() : base()
         {
         }
 
-        #endregion Constructor
-
-        #region Properties
-
         /// <summary>
-        /// Gets or sets the flag whether this is a comple grouper
+        /// Gets or sets the flag whether this is a complex grouper
         /// </summary>
         public bool ComplexType { get; set; }
 
-        #endregion Properties
-
-        #region Methods
-
         /// <summary>
         /// Casts a string to the group
         /// </summary>
         /// <param name="groupedString">The group string as passed in by the Ext framework</param>
         public static explicit operator Group(string groupedString) 
             => string.IsNullOrEmpty(groupedString) ? null : JsonConvert.DeserializeObject<Group>(groupedString);
-
-        #endregion Methods
     }
 }

src/core/Order.cs

@@ -6,19 +6,13 @@
     /// <typeparam name="T"></typeparam>
     public class Order<T>
     {
-        #region Constructor
-
         /// <summary>
         /// Initializes a new instance of the <see cref="Order"/> class
         /// </summary>
         public Order()
         {
         }
 
-        #endregion Constructor
-
-        #region Properties
-
         /// <summary>
         /// Gets or sets the property on which to sort on
         /// </summary>
@@ -28,7 +22,5 @@ public Order()
         /// Gets or sets the flag if the sort operation is ascending
         /// </summary>
         public bool IsAscending { get; set; }
-
-        #endregion Properties
     }
 }

src/core/Sort.cs

@@ -7,29 +7,18 @@ namespace Dime.ExtJs
     /// </summary>
     public class Sort : Action
     {
-        #region Constructor
-
         /// <summary>
         /// Initializes a new instance of the <see cref="Sort"/> class
         /// </summary>
         public Sort() : base()
         {
         }
 
-        #endregion Constructor
-
-        #region Methods
-
         /// <summary>
         /// Casts a string to the sorter
         /// </summary>
         /// <param name="orderString">The order string as passed in by the Ext framework</param>
-        public static explicit operator Sort(string orderString)
-        {
-            Sort order = string.IsNullOrEmpty(orderString) ? null : JsonConvert.DeserializeObject<Sort>(orderString);
-            return order;
-        }
-
-        #endregion Methods
+        public static explicit operator Sort(string orderString) 
+            => string.IsNullOrEmpty(orderString) ? null : JsonConvert.DeserializeObject<Sort>(orderString);
     }
 }