Cosmetic cleanup as suggested by the IDE

tinglesoftware · May 16, 2024 · d1806f6 · d1806f6
1 parent 1ce9552
commit d1806f6
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/src/Tingle.AspNetCore.JsonPatch/Internal/ParsedPath.cs b/src/Tingle.AspNetCore.JsonPatch/Internal/ParsedPath.cs
@@ -81,6 +81,6 @@ private static string[] ParsePath(string path)
             strings.Add(sb.ToString());
         }
 
-        return strings.ToArray();
+        return [.. strings];
     }
 }
diff --git a/src/Tingle.AspNetCore.Swagger/Filters/Schemas/InheritDocSchemaFilter.cs b/src/Tingle.AspNetCore.Swagger/Filters/Schemas/InheritDocSchemaFilter.cs
@@ -58,7 +58,7 @@ public InheritDocSchemaFilter(SwaggerGenOptions options, params Type[] excludedT
     /// <param name="context"><see cref="SchemaFilterContext"/>.</param>
     public void Apply(OpenApiSchema schema, SchemaFilterContext context)
     {
-        if (excludedTypes.Any() && excludedTypes.Contains(context.Type)) return;
+        if (excludedTypes.Length != 0 && excludedTypes.Contains(context.Type)) return;
 
         // Try to apply a description for inherited types.
         var memberName = XmlCommentsNodeNameHelper.GetMemberNameForType(context.Type);
@@ -98,10 +98,9 @@ private void ApplyPropertyComments(OpenApiSchema propertySchema, MemberInfo memb
     {
         var memberName = XmlCommentsNodeNameHelper.GetMemberNameForFieldOrProperty(memberInfo);
 
-        if (!inheritedDocs.ContainsKey(memberName)) return;
-        if (excludedTypes.Any() && excludedTypes.Contains(((PropertyInfo)memberInfo).PropertyType)) return;
+        if (excludedTypes.Length != 0 && excludedTypes.Contains(((PropertyInfo)memberInfo).PropertyType)) return;
+        if (!inheritedDocs.TryGetValue(memberName, out string? cref)) return;
 
-        var cref = inheritedDocs[memberName];
         var target = GetTargetRecursive(memberInfo, cref);
 
         var targetXmlNode = GetMemberXmlNode(XmlCommentsNodeNameHelper.GetMemberNameForFieldOrProperty(target));
@@ -184,7 +183,7 @@ private void ApplyPropertyComments(OpenApiSchema propertySchema, MemberInfo memb
     {
         var targets = type.GetInterfaces();
         if (type.BaseType is not null && type.BaseType != typeof(object))
-            targets = targets.Append(type.BaseType).ToArray();
+            targets = [.. targets, type.BaseType];
 
         // Try to find the target, if one is declared.
         if (!string.IsNullOrEmpty(cref))

diff --git a/src/Tingle.Extensions.DataAnnotations/RecursiveValidator.cs b/src/Tingle.Extensions.DataAnnotations/RecursiveValidator.cs
@@ -106,7 +106,7 @@ private static bool TryValidateObjectRecursive(object instance,
         bool result = TryValidateObject(instance, validationResults, validationContextItems);
 
         var properties = instance.GetType().GetProperties().Where(prop => prop.CanRead
-            && !prop.GetCustomAttributes(typeof(SkipRecursiveValidationAttribute), false).Any()
+            && prop.GetCustomAttributes(typeof(SkipRecursiveValidationAttribute), false).Length == 0
             && prop.GetIndexParameters().Length == 0).ToList();
 
         foreach (var property in properties)
@@ -169,7 +169,7 @@ private static void ValidateObjectRecursive(object instance,
         ValidateObject(instance, validationContextItems);
 
         var properties = instance.GetType().GetProperties().Where(prop => prop.CanRead
-            && !prop.GetCustomAttributes(typeof(SkipRecursiveValidationAttribute), false).Any()
+            && prop.GetCustomAttributes(typeof(SkipRecursiveValidationAttribute), false).Length == 0
             && prop.GetIndexParameters().Length == 0).ToList();
 
         foreach (var property in properties)

diff --git a/src/Tingle.Extensions.JsonPatch/Internal/ParsedPath.cs b/src/Tingle.Extensions.JsonPatch/Internal/ParsedPath.cs
@@ -84,6 +84,6 @@ private static string[] ParsePath(string path)
             strings.Add(sb.ToString());
         }
 
-        return strings.ToArray();
+        return [.. strings];
     }
 }
diff --git a/tests/Tingle.Extensions.DataAnnotations.Tests/AllowedValuesAttributeTests.cs b/tests/Tingle.Extensions.DataAnnotations.Tests/AllowedValuesAttributeTests.cs
@@ -120,7 +120,7 @@ public void Works_For_StringArray(string value, bool expected)
     [InlineData(false, "green", "BLUE", "yellow")]
     public void Works_For_CaseSensitiveStrings(bool expected, params string[] value)
     {
-        var obj = new TestModel5(value.ToList());
+        var obj = new TestModel5([.. value]);
         var context = new ValidationContext(obj);
         var results = new List<ValidationResult>();
         var actual = Validator.TryValidateObject(obj, context, results, true);