Updating to new collection initialization syntax, and fixing other wa…

…rnings
interlockledger · Feb 14, 2024 · b59fb40 · b59fb40
1 parent 12ce53f
commit b59fb40
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/InterlockLedger.Commons/Extensions/System.Linq/IEnumerableOfTExtensions.cs b/InterlockLedger.Commons/Extensions/System.Linq/IEnumerableOfTExtensions.cs
@@ -130,7 +130,7 @@ public static IEnumerable<T> RequireNonNulls<T>(this IEnumerable<T?>? items, [Ca
             ? items.Safe().Cast<T>()
             : throw new ArgumentException("List must not contain null elements", parameterName);
 
-    public static IEnumerable<T> Safe<T>(this IEnumerable<T>? values) => values ?? Enumerable.Empty<T>();
+    public static IEnumerable<T> Safe<T>(this IEnumerable<T>? values) => values ?? [];
 
     public static bool SafeAny<T>([NotNullWhen(true)] this IEnumerable<T>? values) => values?.Any() ?? false;
 
@@ -187,7 +187,7 @@ public static async Task<IEnumerable<T>> WithDefaultAsync<T>(
         Func<Task<IEnumerable<T>>> getAlternativeValuesAsync) where T : class =>
          await WithDefaultAsync(getValuesAsync is not null
                                         ? (await getValuesAsync.ConfigureAwait(false))
-                                        : Enumerable.Empty<T>(),
+                                        : [],
                                   getAlternativeValuesAsync).ConfigureAwait(false);
 
     public static async Task<IEnumerable<T>> WithDefaultAsync<T>(

diff --git a/InterlockLedger.Commons/Extensions/System.Threading.Tasks;/TaskExtensions.cs b/InterlockLedger.Commons/Extensions/System.Threading.Tasks;/TaskExtensions.cs
@@ -61,7 +61,7 @@ public static async Task<IEnumerable<T>> WhenAllAsync<T>(this IEnumerable<Task<T
 
     public static async Task<IEnumerable<T>> WhenAllSequentialAsync<T>(this IEnumerable<Task<T>> tasks) {
         if (tasks.None())
-            return Enumerable.Empty<T>();
+            return [];
         var results = new List<T>();
         foreach (var task in tasks)
             results.Add(await task.ConfigureAwait(false));
@@ -76,7 +76,7 @@ public static async Task WhenAllSequentialAsync(this IEnumerable<Task> tasks) {
 
     public static async Task<IEnumerable<T>> WhenAllParallelAsync<T>(this IEnumerable<Task<T>> tasks, int degree) {
         if (tasks.None())
-            return Enumerable.Empty<T>();
+            return [];
         var results = new List<T>();
         foreach (var chunk in tasks.Chunk(degree)) {
             var chunkResults = await Task.WhenAll(chunk).ConfigureAwait(false);

diff --git a/InterlockLedger.Commons/Types/System.Text.Json.Serialization/JsonCustomConverter.cs b/InterlockLedger.Commons/Types/System.Text.Json.Serialization/JsonCustomConverter.cs
@@ -39,12 +39,14 @@ public JsonCustomConverter() { }
     public override bool CanConvert(Type typeToConvert) =>
          typeToConvert.Required() == typeof(T) || typeToConvert.IsSubclassOf(typeof(T));
 
+#pragma warning disable IDE0072 // Add missing cases
     public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) =>
         reader.TokenType switch {
             JsonTokenType.Null => T.Empty,
             JsonTokenType.String => reader.GetString().ParseAs<T>(),
             _ => throw new NotSupportedException(),
         };
+#pragma warning restore IDE0072 // Add missing cases
 
     public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options) =>
          writer.Required().WriteStringValue(value.TextualRepresentation);

diff --git a/InterlockLedger.Commons/Types/System/PageOf.cs b/InterlockLedger.Commons/Types/System/PageOf.cs
@@ -38,5 +38,5 @@ public record PageOf<T>(IEnumerable<T> Items, ushort Page, byte PageSize, ushort
     public PageOf(IEnumerable<T> items, bool lastToFirst) : this(items.Required(), 0, 0, (ushort)(items.SafeAny() ? 1 : 0), lastToFirst) {
     }
 
-    public static PageOf<T> Empty { get; } = new PageOf<T>(Enumerable.Empty<T>(), 0, 0, 0, false);
+    public static PageOf<T> Empty { get; } = new PageOf<T>([], 0, 0, 0, false);
 }