Fixed nullability warnings. (#223)

Author: fiseni

Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/Ardalis.Specification.EntityFrameworkCore.csproj

@@ -21,7 +21,7 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>9.0</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/CachedReadConcurrentDictionary.cs

@@ -2,6 +2,7 @@
 using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 using System.Threading;
 
@@ -12,7 +13,7 @@ namespace Ardalis.Specification.EntityFrameworkCore
     /// </summary>
     /// <typeparam name="TKey">The key type.</typeparam>
     /// <typeparam name="TValue">The value type.</typeparam>
-    internal class CachedReadConcurrentDictionary<TKey, TValue> : IDictionary<TKey, TValue>
+    internal class CachedReadConcurrentDictionary<TKey, TValue> : IDictionary<TKey, TValue> where TKey : notnull
     {
         /// <summary>
         /// The number of cache misses which are tolerated before the cache is regenerated.
@@ -181,9 +182,15 @@ public bool Remove(TKey key)
             return result;
         }
 
+#if NET6_0_OR_GREATER
+        /// <inheritdoc />
+        public bool TryGetValue(TKey key, [MaybeNullWhen(false)] out TValue value) => this.GetReadDictionary().TryGetValue(key, out value);
+#else
         /// <inheritdoc />
         public bool TryGetValue(TKey key, out TValue value) => this.GetReadDictionary().TryGetValue(key, out value);
 
+#endif
+
         /// <inheritdoc />
         public TValue this[TKey key]
         {

Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/Evaluators/IncludeEvaluator.cs

@@ -89,7 +89,11 @@ private IQueryable<T> BuildInclude<T>(IQueryable query, IncludeExpressionInfo in
 
             if (!this.cacheEnabled)
             {
-                return (IQueryable<T>)IncludeMethodInfo.MakeGenericMethod(includeInfo.EntityType, includeInfo.PropertyType).Invoke(null, new object[] { query, includeInfo.LambdaExpression, });
+                var result = IncludeMethodInfo.MakeGenericMethod(includeInfo.EntityType, includeInfo.PropertyType).Invoke(null, new object[] { query, includeInfo.LambdaExpression });
+
+                _ = result ?? throw new TargetException();
+
+                return (IQueryable<T>)result;
             }
 
             var include = DelegatesCache.GetOrAdd((includeInfo.EntityType, includeInfo.PropertyType, null), CreateIncludeDelegate).Value;
@@ -104,10 +108,14 @@ private IQueryable<T> BuildThenInclude<T>(IQueryable query, IncludeExpressionInf
 
             if (!this.cacheEnabled)
             {
-                return (IQueryable<T>)(IsGenericEnumerable(includeInfo.PreviousPropertyType, out var previousPropertyType)
+                var result = (IsGenericEnumerable(includeInfo.PreviousPropertyType, out var previousPropertyType)
                         ? ThenIncludeAfterEnumerableMethodInfo
                         : ThenIncludeAfterReferenceMethodInfo).MakeGenericMethod(includeInfo.EntityType, previousPropertyType, includeInfo.PropertyType)
                     .Invoke(null, new object[] { query, includeInfo.LambdaExpression, });
+
+                _ = result ?? throw new TargetException();
+
+                return (IQueryable<T>)result;
             }
 
             var thenInclude = DelegatesCache.GetOrAdd((includeInfo.EntityType, includeInfo.PropertyType, includeInfo.PreviousPropertyType), CreateThenIncludeDelegate).Value;
@@ -144,8 +152,10 @@ private static Lazy<Func<IQueryable, LambdaExpression, IQueryable>> CreateInclud
         private static Lazy<Func<IQueryable, LambdaExpression, IQueryable>> CreateThenIncludeDelegate((Type EntityType, Type PropertyType, Type? PreviousPropertyType) cacheKey)
             => new Lazy<Func<IQueryable, LambdaExpression, IQueryable>>(() =>
             {
+                _ = cacheKey.PreviousPropertyType ?? throw new ArgumentNullException(nameof(cacheKey.PreviousPropertyType));
+
                 MethodInfo thenIncludeInfo = ThenIncludeAfterReferenceMethodInfo;
-                if (IsGenericEnumerable(cacheKey.PreviousPropertyType!, out var previousPropertyType))
+                if (IsGenericEnumerable(cacheKey.PreviousPropertyType, out var previousPropertyType))
                 {
                     thenIncludeInfo = ThenIncludeAfterEnumerableMethodInfo;
                 }

Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/Extensions/SearchExtension.cs

@@ -1,13 +1,22 @@
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Reflection;
 using Microsoft.EntityFrameworkCore;
 
 namespace Ardalis.Specification.EntityFrameworkCore
 {
     public static class SearchExtension
     {
+        private static readonly MethodInfo LikeMethodInfo = typeof(DbFunctionsExtensions)
+            .GetMethod(nameof(DbFunctionsExtensions.Like), new Type[] { typeof(DbFunctions), typeof(string), typeof(string) })
+            ?? throw new TargetException("The EF.Functions.Like not found");
+
+        private static readonly MemberExpression Functions = Expression.Property(null, typeof(EF).GetProperty(nameof(EF.Functions)) 
+            ?? throw new TargetException("The EF.Functions not found!"));
+
         /// <summary>
         /// Filters <paramref name="source"/> by applying an 'SQL LIKE' operation to it.
         /// </summary>
@@ -30,16 +39,14 @@ public static IQueryable<T> Search<T>(this IQueryable<T> source, IEnumerable<Sea
                 if (string.IsNullOrEmpty(criteria.SearchTerm))
                     continue;
 
-                var functions = Expression.Property(null, typeof(EF).GetProperty(nameof(EF.Functions)));
-                var like = typeof(DbFunctionsExtensions).GetMethod(nameof(DbFunctionsExtensions.Like), new Type[] { functions.Type, typeof(string), typeof(string) });
-
-                var propertySelector = ParameterReplacerVisitor.Replace(criteria.Selector, criteria.Selector.Parameters[0], parameter);
+                var propertySelector = ParameterReplacerVisitor.Replace(criteria.Selector, criteria.Selector.Parameters[0], parameter) as LambdaExpression;
+                _ = propertySelector ?? throw new InvalidExpressionException();
 
                 var likeExpression = Expression.Call(
                                         null,
-                                        like,
-                                        functions,
-                                        (propertySelector as LambdaExpression)?.Body,
+                                        LikeMethodInfo,
+                                        Functions,
+                                        propertySelector.Body,
                                         Expression.Constant(criteria.SearchTerm));
 
                 expr = expr == null ? (Expression)likeExpression : Expression.OrElse(expr, likeExpression);

Specification.EntityFrameworkCore/src/Ardalis.Specification.EntityFrameworkCore/RepositoryBaseOfT.cs

@@ -72,7 +72,7 @@ public virtual async Task<int> SaveChangesAsync(CancellationToken cancellationTo
             return await ApplySpecification(specification).FirstOrDefaultAsync(cancellationToken);
         }
         /// <inheritdoc/>
-        public virtual async Task<TResult> GetBySpecAsync<TResult>(ISpecification<T, TResult> specification, CancellationToken cancellationToken = default)
+        public virtual async Task<TResult?> GetBySpecAsync<TResult>(ISpecification<T, TResult> specification, CancellationToken cancellationToken = default)
         {
             return await ApplySpecification(specification).FirstOrDefaultAsync(cancellationToken);
         }

Specification.EntityFrameworkCore/tests/Ardalis.Specification.EntityFrameworkCore.IntegrationTests/Ardalis.Specification.EntityFrameworkCore.IntegrationTests.csproj

@@ -3,7 +3,8 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
-    <Nullable>enable</Nullable>
+	<LangVersion>9.0</LangVersion>
+	<Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>

Specification/src/Ardalis.Specification/Ardalis.Specification.csproj

@@ -33,7 +33,7 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>9.0</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

Specification/src/Ardalis.Specification/IReadRepositoryBase.cs

@@ -43,7 +43,7 @@ public interface IReadRepositoryBase<T> where T : class
         /// A task that represents the asynchronous operation.
         /// The task result contains the <typeparamref name="TResult" />.
         /// </returns>
-        Task<TResult> GetBySpecAsync<TResult>(ISpecification<T, TResult> specification, CancellationToken cancellationToken = default);
+        Task<TResult?> GetBySpecAsync<TResult>(ISpecification<T, TResult> specification, CancellationToken cancellationToken = default);
 
         /// <summary>
         /// Finds all entities of <typeparamref name="T" /> from the database.

Specification/tests/Ardalis.Specification.UnitTests/Ardalis.Specification.UnitTests.csproj

@@ -4,7 +4,7 @@
     <TargetFrameworks>net6.0;net472</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <Nullable>enable</Nullable>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>9.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>