Clean up JoinRpg.Helpers yet again (#1373)

Shaving of some not required thing in helpers

Author: leotsarev

src/JoinRpg.Helpers.Web/IdListUrlExtensions.cs

@@ -89,7 +89,7 @@ private static string MagicJoin([NotNull] this IEnumerable<int> list)
 
                         if (needSep)
                         {
-                            _ = builder.Append(",");
+                            _ = builder.Append(',');
                         }
                         _ = builder.Append(next - 25);
                         needSep = true;

src/JoinRpg.Helpers/EntityFrameworkExtensions.cs

@@ -30,14 +30,5 @@ public static void AddLinkList<T>(this ICollection<T> target, IEnumerable<T> new
         }
 
         public static void CleanLinksList<T>(this ICollection<T> target) => target.AssignLinksList(new List<T>());
-
-        public static void RemoveFromLinkList<T>(this ICollection<T> target,
-            IEnumerable<T> linksToRemove)
-        {
-            foreach (var value in linksToRemove.Intersect(target).ToList())
-            {
-                _ = target.Remove(value);
-            }
-        }
     }
 }

src/JoinRpg.Helpers/LambdaHelpers.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.Specialized;
 using System.Linq;
 using JetBrains.Annotations;
 
@@ -10,8 +9,6 @@ public static class StaticCollectionHelpers
     {
         private static readonly Random Rng = new();
 
-        public static Dictionary<string, string> ToDictionary(this NameValueCollection collection) => collection.AllKeys.ToDictionary(key => key, key => collection[key]);
-
         [NotNull, ItemNotNull]
         public static ISet<T> FlatTree<T>(this T obj,
             Func<T, IEnumerable<T>> parentSelectorFunc,
@@ -50,9 +47,11 @@ public static IEnumerable<T> UnionIf<T>(this IEnumerable<T> source,
             bool add)
             => source.Union(add ? enumerable : Enumerable.Empty<T>());
 
+        [Obsolete("Use Append()")]
         public static IEnumerable<T> Union<T>(this IEnumerable<T> source, T t) => source.Union(new[] { t });
 
-        public static IEnumerable<T> WhereNotNull<T>(this IEnumerable<T?> source) where T : class
+        public static IEnumerable<T> WhereNotNull<T>(this IEnumerable<T?> source)
+            where T : class
         {
             foreach (var i in source)
             {
@@ -63,18 +62,19 @@ public static IEnumerable<T> WhereNotNull<T>(this IEnumerable<T?> source) where
             }
         }
 
-        public static IEnumerable<int> WhereNotNull(this IEnumerable<int?> source)
+        public static IEnumerable<T> WhereNotNull<T>(this IEnumerable<T?> source)
+            where T : struct
         {
             foreach (var i in source)
             {
-                if (i is int v)
+                if (i is T v)
                 {
                     yield return v;
                 }
             }
         }
 
-        public static IEnumerable<T> OrEmptyList<T>(this IEnumerable<T> collection) => collection ?? Enumerable.Empty<T>();
+        public static IEnumerable<T> OrEmptyList<T>(this IEnumerable<T>? collection) => collection ?? Enumerable.Empty<T>();
 
         public static IEnumerable<T> Shuffle<T>([NotNull]
             this IEnumerable<T> source) => Shuffle(source, Rng);
@@ -120,13 +120,5 @@ public static IEnumerable<T> UnionUntilTotalCount<T>([NotNull]
                     .Except(alreadyTaken)
                     .Take(Math.Max(0, totalLimit - alreadyTaken.Count)));
         }
-
-        public static IEnumerable<int> GetRandomSource(this Random random)
-        {
-            while (true)
-            {
-                yield return random.Next();
-            }
-        }
     }
 }

src/JoinRpg.Helpers/StaticCollectionHelpers.cs

@@ -16,8 +16,5 @@ public static class StaticEnumHelpers
                 .GetField(enumValue.ToString())?
                 .GetCustomAttribute<TAttribute>();
         }
-
-        [PublicAPI]
-        public static IEnumerable<T> GetValues<T>() => Enum.GetValues(typeof(T)).Cast<T>();
     }
 }

src/JoinRpg.Helpers/StaticEnumHelpers.cs

@@ -73,7 +73,7 @@ public static IEnumerable<int> UnprefixNumbers([NotNull, ItemNotNull]
             string prefix)
         {
             return number.StartsWith(prefix)
-                ? (int?)int.Parse(number.Substring(prefix.Length))
+                ? int.Parse(number.Substring(prefix.Length))
                 : null;
         }
 
@@ -190,46 +190,17 @@ public static string ToHexHash(this string str, HashAlgorithm hashAlgorithm)
             return hashAlgorithm.ComputeHash(bytes).ToHexString();
         }
 
-        public static string AfterSeparator(this string str, char separator) => str.SkipWhile(c => c != separator).Skip(1).AsString();
-
-        public static string BeforeSeparator(this string str, char separator) => str.TakeWhile(c => c != separator).AsString();
-
         [NotNull]
-        public static int[] ToIntList([CanBeNull]
-            this string? claimIds)
+        public static int[] ToIntList(this string? claimIds)
         {
-            if (string.IsNullOrWhiteSpace(claimIds))
+            if (claimIds is null)
             {
                 return Array.Empty<int>();
             }
 
             return claimIds.Split(',').WhereNotNullOrWhiteSpace().Select(int.Parse).ToArray();
         }
 
-        [NotNull]
-        public static IEnumerable<byte> AsUtf8BytesWithLimit([NotNull]
-            this string formattableString,
-            int bytesLimit)
-        {
-            if (formattableString == null)
-            {
-                throw new ArgumentNullException(nameof(formattableString));
-            }
-
-            var ch = formattableString.ToCharArray();
-            var epilogue = Encoding.UTF8.GetBytes("…");
-            for (var i = ch.Length; i > 0; i--)
-            {
-                var chunkBytes = Encoding.UTF8.GetByteCount(ch, 0, i);
-                if (chunkBytes + epilogue.Length <= bytesLimit)
-                {
-                    return Encoding.UTF8.GetBytes(ch, 0, i).Concat(epilogue);
-                }
-            }
-
-            return Enumerable.Empty<byte>();
-        }
-
         [NotNull]
         public static string WithDefaultStringValue([CanBeNull]
             this string value,