Merge pull request #12 from I-RzR-I/feature/AddImprovements

I-RzR-I · web-flow · commit abb190034a7f · 2025-01-12T19:29:45.000+02:00
Feature/add improvements
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022-2024 RzR
+Copyright (c) 2022-2025 RzR
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -31,4 +31,10 @@
 -> Add own implementation `EntityPropChangeEventBase` for `INotifyPropertyChanged` .<br />
 
 ### **1.0.10.3531** 
--> Add methods to set content `SetContent` with internal property changed event.<br />
+-> Add methods to set content `SetContent` with internal property changed event;<br />
+
+### **1.1.0.0** 
+-> Add small adjustments and fixes;<br />
+-> Small core reorganization;<br />
+-> Parameters rename;<br />
+-> Update the packages reference version;<br />
diff --git a/src/EntityMaxLengthTrim/EntityMaxLengthTrim.csproj b/src/EntityMaxLengthTrim/EntityMaxLengthTrim.csproj
@@ -50,7 +50,7 @@
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net45'">
     <PackageReference Include="CodeSource">
-      <Version>1.0.6.933</Version>
+      <Version>2.0.0.0</Version>
     </PackageReference>
     <PackageReference Include="System.ComponentModel.Annotations">
       <Version>5.0</Version>
@@ -59,7 +59,7 @@
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.5'">
     <PackageReference Include="CodeSource">
-      <Version>1.0.6.933</Version>
+      <Version>2.0.0.0</Version>
     </PackageReference>
     <PackageReference Include="System.ComponentModel.Annotations">
       <Version>5.0</Version>
@@ -74,7 +74,7 @@
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="CodeSource">
-      <Version>1.0.6.933</Version>
+      <Version>2.0.0.0</Version>
     </PackageReference>
     <PackageReference Include="System.ComponentModel.Annotations">
       <Version>5.0</Version>
@@ -83,7 +83,7 @@
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1'">
     <PackageReference Include="CodeSource">
-      <Version>1.0.6.933</Version>
+      <Version>2.0.0.0</Version>
     </PackageReference>
     <PackageReference Include="System.ComponentModel.Annotations">
       <Version>5.0</Version>
diff --git a/src/EntityMaxLengthTrim/EntityPropChangeEventBase.cs b/src/EntityMaxLengthTrim/EntityPropChangeEventBase.cs
@@ -29,7 +29,7 @@ namespace EntityMaxLengthTrim
     /// <remarks></remarks>
     /// <seealso cref="System.ComponentModel.INotifyPropertyChanged" />
     /// =================================================================================================
-    public class EntityPropChangeEventBase : INotifyPropertyChanged
+    public abstract class EntityPropChangeEventBase : INotifyPropertyChanged
     {
         /// <summary>
         ///     Property changed event handler
@@ -41,7 +41,9 @@ public class EntityPropChangeEventBase : INotifyPropertyChanged
         /// </summary>
         /// <param name="callingEntity">Calling entity</param>
         /// <param name="propertyName">Changed property name</param>
-        protected virtual void OnPropertyChanged<T>(T callingEntity, string propertyName)
+        /// <typeparam name="TEntity">Calling entity type</typeparam>
+        protected virtual void OnPropertyChanged<TEntity>(TEntity callingEntity, string propertyName)
+            where TEntity : class
         {
             StringInterceptor.ApplyStringMaxAllowedLength(callingEntity, propertyName, false);
             PropertyChanged?.Invoke(callingEntity, new PropertyChangedEventArgs(propertyName));
@@ -54,10 +56,11 @@ protected virtual void OnPropertyChanged<T>(T callingEntity, string propertyName
         /// <param name="propertyName">Changed property name</param>
         /// <param name="getValue">Get property value</param>
         /// <param name="setValue">Set property value</param>
-        /// <typeparam name="T">Calling entity type</typeparam>
+        /// <typeparam name="TEntity">Calling entity type</typeparam>
         /// <returns></returns>
-        protected virtual void SetContent<T>(T callingEntity, string propertyName, ref string getValue,
+        protected virtual void SetContent<TEntity>(TEntity callingEntity, string propertyName, ref string getValue,
             ref string setValue)
+            where TEntity : class
         {
             if (getValue == setValue) return;
 
@@ -74,10 +77,11 @@ protected virtual void SetContent<T>(T callingEntity, string propertyName, ref s
         /// <param name="getValue">Get property value</param>
         /// <param name="setValue">Set property value</param>
         /// <param name="length">Property maximum allowed length.</param>
-        /// <typeparam name="T">Calling entity type</typeparam>
+        /// <typeparam name="TEntity">Calling entity type</typeparam>
         /// <returns></returns>
-        protected virtual void SetContent<T>(T callingEntity, string propertyName, ref string getValue,
+        protected virtual void SetContent<TEntity>(TEntity callingEntity, string propertyName, ref string getValue,
             ref string setValue, int length)
+            where TEntity : class
         {
             if (getValue == setValue) return;
 
diff --git a/src/EntityMaxLengthTrim/Extensions/FluentExtensions.cs b/src/EntityMaxLengthTrim/Extensions/FluentExtensions.cs
@@ -40,12 +40,12 @@ public static class FluentExtensions
         /// <returns></returns>
         /// <typeparam name="TEntity">Type of initialized object.</typeparam>
         /// <remarks></remarks>
-        public static TEntity ToSafeStoreStrings<TEntity>(this TEntity initSourceObject, bool useDotOnEnd = false)
+        public static TEntity ToSafeStoreStrings<TEntity>(
+            this TEntity initSourceObject,
+            bool useDotOnEnd = false)
             where TEntity : class
-        {
-            return StringInterceptor.ApplyStringMaxAllowedLength(initSourceObject, useDotOnEnd);
-        }
-        
+            => StringInterceptor.ApplyStringMaxAllowedLength(initSourceObject, useDotOnEnd);
+
         /// <summary>
         ///     Prepare initialized object to save store string properties.
         /// </summary>
@@ -61,13 +61,12 @@ public static TEntity ToSafeStoreStrings<TEntity>(this TEntity initSourceObject,
         /// <returns></returns>
         /// <typeparam name="TEntity">Type of initialized object.</typeparam>
         /// <remarks></remarks>
-        public static TEntity ToSafeStoreStrings<TEntity>(this TEntity initSourceObject,
+        public static TEntity ToSafeStoreStrings<TEntity>(
+            this TEntity initSourceObject,
             IReadOnlyCollection<string> truncateWithDots,
-            bool processOnlyAssigned = false) where TEntity : class
-        {
-            return StringInterceptor.ApplyStringMaxAllowedLength(initSourceObject, truncateWithDots,
-                processOnlyAssigned);
-        }
+            bool processOnlyAssigned = false)
+            where TEntity : class
+            => StringInterceptor.ApplyStringMaxAllowedLength(initSourceObject, truncateWithDots, processOnlyAssigned);
 
         /// <summary>
         ///     Prepare initialized object to save store string properties.
@@ -81,11 +80,11 @@ public static TEntity ToSafeStoreStrings<TEntity>(this TEntity initSourceObject,
         /// <returns></returns>
         /// <typeparam name="TEntity">Type of initialized object.</typeparam>
         /// <remarks></remarks>
-        public static TEntity ToSafeStoreStrings<TEntity>(this TEntity initSourceObject,
+        public static TEntity ToSafeStoreStrings<TEntity>(
+            this TEntity initSourceObject,
             IReadOnlyCollection<PropertyOption> options,
-            bool processOnlyAssigned = false) where TEntity : class
-        {
-            return StringInterceptor.ApplyStringMaxAllowedLength(initSourceObject, options, processOnlyAssigned);
-        }
+            bool processOnlyAssigned = false)
+            where TEntity : class
+            => StringInterceptor.ApplyStringMaxAllowedLength(initSourceObject, options, processOnlyAssigned);
     }
 }
diff --git a/src/EntityMaxLengthTrim/Extensions/IntExtensions.cs b/src/EntityMaxLengthTrim/Extensions/IntExtensions.cs
@@ -33,20 +33,14 @@ internal static class IntExtensions
         /// <param name="source">Source object to be checked</param>
         /// <returns>Return bool value (validation result).</returns>
         [CodeSource("https://github.com/I-RzR-I/DomainCommonExtensions", "RzR", 1.0)]
-        internal static bool IsNullOrZero(this int source)
-        {
-            return source.IsNull() || source == 0;
-        }
+        internal static bool IsNullOrZero(this int source) => source.IsNull() || source == 0;
 
         /// <summary>
         ///     Check if source object is less or equals with 0
         /// </summary>
         /// <param name="source">Source object to be checked</param>
         /// <returns>Return bool value (validation result).</returns>
         [CodeSource("https://github.com/I-RzR-I/DomainCommonExtensions", "RzR", 1.0)]
-        internal static bool IsLessOrEqualWithZero(this int source)
-        {
-            return source <= 0;
-        }
+        internal static bool IsLessOrEqualWithZero(this int source) => source <= 0;
     }
 }
diff --git a/src/EntityMaxLengthTrim/Extensions/ObjectExtensions.cs b/src/EntityMaxLengthTrim/Extensions/ObjectExtensions.cs
@@ -33,20 +33,14 @@ internal static class ObjectExtensions
         /// <param name="source">Object to be checked</param>
         /// <returns>Return bool value (validation result).</returns>
         [CodeSource("https://github.com/I-RzR-I/DomainCommonExtensions", "RzR", 1.0)]
-        internal static bool IsNull(this object source)
-        {
-            return source == null;
-        }
+        internal static bool IsNull(this object source) => source == null;
 
         /// <summary>
         ///     Check if the source object is not null
         /// </summary>
         /// <param name="source">Object to be checked</param>
         /// <returns>Return bool value (validation result).</returns>
         [CodeSource("https://github.com/I-RzR-I/DomainCommonExtensions", "RzR", 1.0)]
-        internal static bool IsNotNull(this object source)
-        {
-            return !source.IsNull();
-        }
+        internal static bool IsNotNull(this object source) => !source.IsNull();
     }
 }
diff --git a/src/EntityMaxLengthTrim/Extensions/StringExtensions.cs b/src/EntityMaxLengthTrim/Extensions/StringExtensions.cs
@@ -28,27 +28,33 @@ namespace EntityMaxLengthTrim.Extensions
     /// <remarks>Extension for string data type, which allows more efficient use and implement code</remarks>
     internal static class StringExtensions
     {
+        /// <summary>
+        ///     Check if the source string value is present
+        /// </summary>
+        /// <param name="source">Source string to be checked</param>
+        /// <returns>Verification value, if is present > true, otherwise false</returns>
+        internal static bool IsPresent(this string source)
+            => !string.IsNullOrEmpty(source) && !string.IsNullOrWhiteSpace(source);
+
         /// <summary>
         ///     Truncates the string to a specified length and replace the truncated to a ...
         /// </summary>
         /// <param name="text">string that will be truncated</param>
         /// <param name="maxLength">total length of characters to maintain before the truncate happens</param>
         /// <param name="useDots">Use 3 dots(...) in the end of string</param>
         /// <returns>Truncated string</returns>
-        [CodeSource(
-            "https://github.com/I-RzR-I/DomainCommonExtensions/blob/main/src/DomainCommonExtensions/DataTypeExtensions/StringExtensions.cs",
-            "RzR", "RzR", "2022-09-27")]
+        [CodeSource("https://github.com/I-RzR-I/DomainCommonExtensions", "RzR", "RzR", "2022-09-27")]
         internal static string Truncate(this string text, int maxLength, bool useDots = false)
         {
+            if (maxLength.IsLessOrEqualWithZero()) return text;
+
             const string suffix = "...";
             var truncatedString = text;
 
-            if (maxLength.IsLessOrEqualWithZero()) return truncatedString;
             var strLength = maxLength - (useDots.Equals(true) ? suffix.Length : 0);
 
             if (strLength.IsLessOrEqualWithZero()) return truncatedString;
-
-            if (text == null || text.Length <= maxLength) return truncatedString;
+            if (!text.IsPresent() || text.Length <= maxLength) return truncatedString;
 
             truncatedString = text.Substring(0, strLength);
             truncatedString = truncatedString.TrimEnd();
diff --git a/src/EntityMaxLengthTrim/Extensions/StringMaxAllowedLengthExtensions.cs b/src/EntityMaxLengthTrim/Extensions/StringMaxAllowedLengthExtensions.cs
@@ -43,19 +43,20 @@ internal static class StringMaxAllowedLengthExtensions
         /// <param name="propertyName">Property name</param>
         /// <returns>Return property length decorated with DatAnnotation</returns>
         /// <remarks>Decoration allowed attributes: MaxLengthAttribute or StringLengthAttribute or MaxAllowedLengthAttribute</remarks>
-        internal static int? GetMaxAllowedLength<T>(this string propertyName)
+        internal static int? GetMaxAllowedLength<TEntity>(this string propertyName)
+            where TEntity : class
         {
             try
             {
-                var length = propertyName.GetFromMaxLengthAttribute<T>();
+                var length = propertyName.GetFromMaxLengthAttribute<TEntity>();
                 if (length.IsNotNull())
                     return length;
 
-                length = propertyName.GetFromStringLengthAttribute<T>();
+                length = propertyName.GetFromStringLengthAttribute<TEntity>();
                 if (length.IsNotNull())
                     return length;
 
-                length = propertyName.GetFromMaxAllowedLengthAttribute<T>();
+                length = propertyName.GetFromMaxAllowedLengthAttribute<TEntity>();
                 if (length.IsNotNull())
                     return length;
             }
@@ -79,11 +80,12 @@ internal static class StringMaxAllowedLengthExtensions
         /// <param name="propertyName">Property name</param>
         /// <returns>Return property length decorated with MaxLengthAttribute</returns>
         /// <remarks>Return 'null' or '0' length in case of exception or not set property length value</remarks>
-        private static int? GetFromMaxLengthAttribute<T>(this string propertyName)
+        private static int? GetFromMaxLengthAttribute<TEntity>(this string propertyName)
+            where TEntity : class
         {
             try
             {
-                var length = typeof(T).GetProperty(propertyName)
+                var length = typeof(TEntity).GetProperty(propertyName)
                     ?.GetCustomAttributes(typeof(MaxLengthAttribute), false).Cast<MaxLengthAttribute>()
                     .FirstOrDefault();
 
@@ -98,11 +100,12 @@ internal static class StringMaxAllowedLengthExtensions
         /// <param name="propertyName">Property name</param>
         /// <returns>Return property length decorated with StringLengthAttribute</returns>
         /// <remarks>Return 'null' or '0' length in case of exception or not set property length value</remarks>
-        private static int? GetFromStringLengthAttribute<T>(this string propertyName)
+        private static int? GetFromStringLengthAttribute<TEntity>(this string propertyName)
+            where TEntity : class
         {
             try
             {
-                var length = typeof(T).GetProperty(propertyName)
+                var length = typeof(TEntity).GetProperty(propertyName)
                     ?.GetCustomAttributes(typeof(StringLengthAttribute), false).Cast<StringLengthAttribute>()
                     .FirstOrDefault();
 
@@ -117,11 +120,12 @@ internal static class StringMaxAllowedLengthExtensions
         /// <param name="propertyName">Property name</param>
         /// <returns>Return property length decorated with MaxAllowedLengthAttribute</returns>
         /// <remarks>Return 'null' or '0' length in case of exception or not set property length value</remarks>
-        private static int? GetFromMaxAllowedLengthAttribute<T>(this string propertyName)
+        private static int? GetFromMaxAllowedLengthAttribute<TEntity>(this string propertyName)
+        where TEntity : class
         {
             try
             {
-                var length = typeof(T).GetProperty(propertyName)
+                var length = typeof(TEntity).GetProperty(propertyName)
                     ?.GetCustomAttributes(typeof(MaxAllowedLengthAttribute), false).Cast<MaxAllowedLengthAttribute>()
                     .FirstOrDefault();
 
diff --git a/src/EntityMaxLengthTrim/Extensions/TypeExtensions.cs b/src/EntityMaxLengthTrim/Extensions/TypeExtensions.cs
@@ -37,7 +37,7 @@ internal static class TypeExtensions
         /// </summary>
         /// <param name="type">Entity type</param>
         /// <returns>Return list of properties(PropertyInfo) from specified 'System.Type'.</returns>
-        [CodeSource("https://github.com/I-RzR-I/DomainCommonExtensions/blob/9a580a3604f5d6127e887da837e7954f3e47c9d6/src/DomainCommonExtensions/CommonExtensions/TypeExtensions.cs#L1", "RzR", 1.0)]
+        [CodeSource("https://github.com/I-RzR-I/DomainCommonExtensions", "RzR", 1.0)]
         internal static IEnumerable<PropertyInfo> GetPropertyInfos(this Type type)
         {
             try
@@ -54,7 +54,7 @@ internal static IEnumerable<PropertyInfo> GetPropertyInfos(this Type type)
         /// </summary>
         /// <param name="type">Entity type</param>
         /// <returns>Return list of properties(PropertyInfo, string properties) from specified 'System.Type'</returns>
-        [CodeSource("https://github.com/I-RzR-I/DomainCommonExtensions/blob/9a580a3604f5d6127e887da837e7954f3e47c9d6/src/DomainCommonExtensions/CommonExtensions/TypeExtensions.cs#L1", "RzR", 1.0)]
+        [CodeSource("https://github.com/I-RzR-I/DomainCommonExtensions", "RzR", 1.0)]
         internal static IEnumerable<PropertyInfo> GetStringPropertyInfos(this Type type)
         {
             try
@@ -72,7 +72,7 @@ internal static IEnumerable<PropertyInfo> GetStringPropertyInfos(this Type type)
         /// </summary>
         /// <param name="type">Entity type</param>
         /// <returns>Return list of properties (string properties) from specified 'System.Type'</returns>
-        [CodeSource("https://github.com/I-RzR-I/DomainCommonExtensions/blob/9a580a3604f5d6127e887da837e7954f3e47c9d6/src/DomainCommonExtensions/CommonExtensions/TypeExtensions.cs#L1", "RzR", 1.0)]
+        [CodeSource("https://github.com/I-RzR-I/DomainCommonExtensions", "RzR", 1.0)]
         internal static IEnumerable<string> GetStringPropertyNames(this Type type)
         {
             try
diff --git a/src/EntityMaxLengthTrim/Interceptors/StringInterceptor.cs b/src/EntityMaxLengthTrim/Interceptors/StringInterceptor.cs
diff --git a/src/shared/GeneralAssemblyInfo.cs b/src/shared/GeneralAssemblyInfo.cs
