Evolve null-checking approach in SQL Server

Part of #19233
dotnet · Nov 4, 2021 · fa6bd22 · fa6bd22
1 parent 74f4e5e
commit fa6bd22
Show file tree

Hide file tree

Showing 44 changed files with 39 additions and 513 deletions.
diff --git a/src/EFCore.SqlServer/Design/Internal/SqlServerAnnotationCodeGenerator.cs b/src/EFCore.SqlServer/Design/Internal/SqlServerAnnotationCodeGenerator.cs
@@ -9,7 +9,6 @@
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.EntityFrameworkCore.SqlServer.Metadata.Internal;
-using Microsoft.EntityFrameworkCore.Utilities;
 
 namespace Microsoft.EntityFrameworkCore.SqlServer.Design.Internal
 {
@@ -285,9 +284,6 @@ public override IReadOnlyList<MethodCallCodeFragment> GenerateFluentApiCalls(
         /// </summary>
         protected override bool IsHandledByConvention(IModel model, IAnnotation annotation)
         {
-            Check.NotNull(model, nameof(model));
-            Check.NotNull(annotation, nameof(annotation));
-
             if (annotation.Name == RelationalAnnotationNames.DefaultSchema)
             {
                 return (string?)annotation.Value == "dbo";

diff --git a/src/EFCore.SqlServer/Design/Internal/SqlServerDesignTimeServices.cs b/src/EFCore.SqlServer/Design/Internal/SqlServerDesignTimeServices.cs
@@ -5,7 +5,6 @@
 using Microsoft.EntityFrameworkCore.Design.Internal;
 using Microsoft.EntityFrameworkCore.Scaffolding;
 using Microsoft.EntityFrameworkCore.SqlServer.Scaffolding.Internal;
-using Microsoft.EntityFrameworkCore.Utilities;
 using Microsoft.Extensions.DependencyInjection;
 
 [assembly: DesignTimeProviderServices("Microsoft.EntityFrameworkCore.SqlServer.Design.Internal.SqlServerDesignTimeServices")]
@@ -28,9 +27,8 @@ public class SqlServerDesignTimeServices : IDesignTimeServices
         /// </summary>
         public virtual void ConfigureDesignTimeServices(IServiceCollection serviceCollection)
         {
-            Check.NotNull(serviceCollection, nameof(serviceCollection));
-
             serviceCollection.AddEntityFrameworkSqlServer();
+
 #pragma warning disable EF1001 // Internal EF Core API usage.
             new EntityFrameworkRelationalDesignServicesBuilder(serviceCollection)
                 .TryAdd<IAnnotationCodeGenerator, SqlServerAnnotationCodeGenerator>()

diff --git a/src/EFCore.SqlServer/Extensions/SqlServerDbContextOptionsBuilderExtensions.cs b/src/EFCore.SqlServer/Extensions/SqlServerDbContextOptionsBuilderExtensions.cs
@@ -44,8 +44,6 @@ public static DbContextOptionsBuilder UseSqlServer(
             this DbContextOptionsBuilder optionsBuilder,
             Action<SqlServerDbContextOptionsBuilder>? sqlServerOptionsAction = null)
         {
-            Check.NotNull(optionsBuilder, nameof(optionsBuilder));
-
             ((IDbContextOptionsBuilderInfrastructure)optionsBuilder).AddOrUpdateExtension(GetOrCreateExtension(optionsBuilder));
 
             ConfigureWarnings(optionsBuilder);
@@ -72,7 +70,6 @@ public static DbContextOptionsBuilder UseSqlServer(
             string connectionString,
             Action<SqlServerDbContextOptionsBuilder>? sqlServerOptionsAction = null)
         {
-            Check.NotNull(optionsBuilder, nameof(optionsBuilder));
             Check.NotEmpty(connectionString, nameof(connectionString));
 
             var extension = (SqlServerOptionsExtension)GetOrCreateExtension(optionsBuilder).WithConnectionString(connectionString);
@@ -107,7 +104,6 @@ public static DbContextOptionsBuilder UseSqlServer(
             DbConnection connection,
             Action<SqlServerDbContextOptionsBuilder>? sqlServerOptionsAction = null)
         {
-            Check.NotNull(optionsBuilder, nameof(optionsBuilder));
             Check.NotNull(connection, nameof(connection));
 
             var extension = (SqlServerOptionsExtension)GetOrCreateExtension(optionsBuilder).WithConnection(connection);

diff --git a/src/EFCore.SqlServer/Extensions/SqlServerDbSetExtensions.cs b/src/EFCore.SqlServer/Extensions/SqlServerDbSetExtensions.cs
@@ -5,7 +5,6 @@
 using System.Linq;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.SqlServer.Query.Internal;
-using Microsoft.EntityFrameworkCore.Utilities;
 
 // ReSharper disable once CheckNamespace
 namespace Microsoft.EntityFrameworkCore
@@ -40,8 +39,6 @@ public static IQueryable<TEntity> TemporalAsOf<TEntity>(
             DateTime utcPointInTime)
             where TEntity : class
         {
-            Check.NotNull(source, nameof(source));
-
             var queryableSource = (IQueryable)source;
             var queryRootExpression = (QueryRootExpression)queryableSource.Expression;
             var entityType = queryRootExpression.EntityType;
@@ -88,8 +85,6 @@ public static IQueryable<TEntity> TemporalFromTo<TEntity>(
             DateTime utcTo)
             where TEntity : class
         {
-            Check.NotNull(source, nameof(source));
-
             var queryableSource = (IQueryable)source;
             var queryRootExpression = (QueryRootExpression)queryableSource.Expression;
             var entityType = queryRootExpression.EntityType;
@@ -137,8 +132,6 @@ public static IQueryable<TEntity> TemporalBetween<TEntity>(
             DateTime utcTo)
             where TEntity : class
         {
-            Check.NotNull(source, nameof(source));
-
             var queryableSource = (IQueryable)source;
             var queryRootExpression = (QueryRootExpression)queryableSource.Expression;
             var entityType = queryRootExpression.EntityType;
@@ -186,8 +179,6 @@ public static IQueryable<TEntity> TemporalContainedIn<TEntity>(
             DateTime utcTo)
             where TEntity : class
         {
-            Check.NotNull(source, nameof(source));
-
             var queryableSource = (IQueryable)source;
             var queryRootExpression = (QueryRootExpression)queryableSource.Expression;
             var entityType = queryRootExpression.EntityType;
@@ -219,8 +210,6 @@ public static IQueryable<TEntity> TemporalAll<TEntity>(
             this DbSet<TEntity> source)
             where TEntity : class
         {
-            Check.NotNull(source, nameof(source));
-
             var queryableSource = (IQueryable)source;
             var queryRootExpression = (QueryRootExpression)queryableSource.Expression;
             var entityType = queryRootExpression.EntityType;

diff --git a/src/EFCore.SqlServer/Extensions/SqlServerEntityTypeBuilderExtensions.cs b/src/EFCore.SqlServer/Extensions/SqlServerEntityTypeBuilderExtensions.cs
@@ -32,8 +32,6 @@ public static EntityTypeBuilder IsMemoryOptimized(
             this EntityTypeBuilder entityTypeBuilder,
             bool memoryOptimized = true)
         {
-            Check.NotNull(entityTypeBuilder, nameof(entityTypeBuilder));
-
             entityTypeBuilder.Metadata.SetIsMemoryOptimized(memoryOptimized);
 
             return entityTypeBuilder;
@@ -70,8 +68,6 @@ public static OwnedNavigationBuilder IsMemoryOptimized(
             this OwnedNavigationBuilder collectionOwnershipBuilder,
             bool memoryOptimized = true)
         {
-            Check.NotNull(collectionOwnershipBuilder, nameof(collectionOwnershipBuilder));
-
             collectionOwnershipBuilder.OwnedEntityType.SetIsMemoryOptimized(memoryOptimized);
 
             return collectionOwnershipBuilder;
@@ -140,11 +136,7 @@ public static bool CanSetIsMemoryOptimized(
             this IConventionEntityTypeBuilder entityTypeBuilder,
             bool? memoryOptimized,
             bool fromDataAnnotation = false)
-        {
-            Check.NotNull(entityTypeBuilder, nameof(entityTypeBuilder));
-
-            return entityTypeBuilder.CanSetAnnotation(SqlServerAnnotationNames.MemoryOptimized, memoryOptimized, fromDataAnnotation);
-        }
+            => entityTypeBuilder.CanSetAnnotation(SqlServerAnnotationNames.MemoryOptimized, memoryOptimized, fromDataAnnotation);
 
         /// <summary>
         ///     Configures the table as temporal.
@@ -190,11 +182,7 @@ public static bool CanSetIsTemporal(
             this IConventionEntityTypeBuilder entityTypeBuilder,
             bool temporal = true,
             bool fromDataAnnotation = false)
-        {
-            Check.NotNull(entityTypeBuilder, nameof(entityTypeBuilder));
-
-            return entityTypeBuilder.CanSetAnnotation(SqlServerAnnotationNames.IsTemporal, temporal, fromDataAnnotation);
-        }
+            => entityTypeBuilder.CanSetAnnotation(SqlServerAnnotationNames.IsTemporal, temporal, fromDataAnnotation);
 
         /// <summary>
         ///     Configures a history table name for the entity mapped to a temporal table.
@@ -241,7 +229,6 @@ public static bool CanSetHistoryTableName(
             string name,
             bool fromDataAnnotation = false)
         {
-            Check.NotNull(entityTypeBuilder, nameof(entityTypeBuilder));
             Check.NotNull(name, nameof(name));
 
             return entityTypeBuilder.CanSetAnnotation(SqlServerAnnotationNames.TemporalHistoryTableName, name, fromDataAnnotation);
@@ -291,11 +278,7 @@ public static bool CanSetHistoryTableSchema(
             this IConventionEntityTypeBuilder entityTypeBuilder,
             string? schema,
             bool fromDataAnnotation = false)
-        {
-            Check.NotNull(entityTypeBuilder, nameof(entityTypeBuilder));
-
-            return entityTypeBuilder.CanSetAnnotation(SqlServerAnnotationNames.TemporalHistoryTableSchema, schema, fromDataAnnotation);
-        }
+            => entityTypeBuilder.CanSetAnnotation(SqlServerAnnotationNames.TemporalHistoryTableSchema, schema, fromDataAnnotation);
 
         /// <summary>
         ///     Configures a period start property for the entity mapped to a temporal table.
@@ -341,12 +324,8 @@ public static bool CanSetPeriodStart(
             this IConventionEntityTypeBuilder entityTypeBuilder,
             string? propertyName,
             bool fromDataAnnotation = false)
-        {
-            Check.NotNull(entityTypeBuilder, nameof(entityTypeBuilder));
-
-            return entityTypeBuilder.CanSetAnnotation(
+            => entityTypeBuilder.CanSetAnnotation(
                 SqlServerAnnotationNames.TemporalPeriodStartPropertyName, propertyName, fromDataAnnotation);
-        }
 
         /// <summary>
         ///     Configures a period end property for the entity mapped to a temporal table.
@@ -392,11 +371,7 @@ public static bool CanSetPeriodEnd(
             this IConventionEntityTypeBuilder entityTypeBuilder,
             string? propertyName,
             bool fromDataAnnotation = false)
-        {
-            Check.NotNull(entityTypeBuilder, nameof(entityTypeBuilder));
-
-            return entityTypeBuilder.CanSetAnnotation(
+            => entityTypeBuilder.CanSetAnnotation(
                 SqlServerAnnotationNames.TemporalPeriodEndPropertyName, propertyName, fromDataAnnotation);
-        }
     }
 }
diff --git a/src/EFCore.SqlServer/Extensions/SqlServerIndexBuilderExtensions.cs b/src/EFCore.SqlServer/Extensions/SqlServerIndexBuilderExtensions.cs
@@ -38,8 +38,6 @@ public static class SqlServerIndexBuilderExtensions
         /// <returns>A builder to further configure the index.</returns>
         public static IndexBuilder IsClustered(this IndexBuilder indexBuilder, bool clustered = true)
         {
-            Check.NotNull(indexBuilder, nameof(indexBuilder));
-
             indexBuilder.Metadata.SetIsClustered(clustered);
 
             return indexBuilder;
@@ -106,11 +104,7 @@ public static bool CanSetIsClustered(
             this IConventionIndexBuilder indexBuilder,
             bool? clustered,
             bool fromDataAnnotation = false)
-        {
-            Check.NotNull(indexBuilder, nameof(indexBuilder));
-
-            return indexBuilder.CanSetAnnotation(SqlServerAnnotationNames.Clustered, clustered, fromDataAnnotation);
-        }
+            => indexBuilder.CanSetAnnotation(SqlServerAnnotationNames.Clustered, clustered, fromDataAnnotation);
 
         /// <summary>
         ///     Configures index include properties when targeting SQL Server.
@@ -125,7 +119,6 @@ public static bool CanSetIsClustered(
         /// <returns>A builder to further configure the index.</returns>
         public static IndexBuilder IncludeProperties(this IndexBuilder indexBuilder, params string[] propertyNames)
         {
-            Check.NotNull(indexBuilder, nameof(indexBuilder));
             Check.NotNull(propertyNames, nameof(propertyNames));
 
             indexBuilder.Metadata.SetIncludeProperties(propertyNames);
@@ -148,7 +141,6 @@ public static IndexBuilder<TEntity> IncludeProperties<TEntity>(
             this IndexBuilder<TEntity> indexBuilder,
             params string[] propertyNames)
         {
-            Check.NotNull(indexBuilder, nameof(indexBuilder));
             Check.NotNull(propertyNames, nameof(propertyNames));
 
             indexBuilder.Metadata.SetIncludeProperties(propertyNames);
@@ -180,7 +172,6 @@ public static IndexBuilder<TEntity> IncludeProperties<TEntity>(
             this IndexBuilder<TEntity> indexBuilder,
             Expression<Func<TEntity, object?>> includeExpression)
         {
-            Check.NotNull(indexBuilder, nameof(indexBuilder));
             Check.NotNull(includeExpression, nameof(includeExpression));
 
             IncludeProperties(
@@ -236,15 +227,11 @@ public static bool CanSetIncludeProperties(
             this IConventionIndexBuilder indexBuilder,
             IReadOnlyList<string>? propertyNames,
             bool fromDataAnnotation = false)
-        {
-            Check.NotNull(indexBuilder, nameof(indexBuilder));
-
-            return (fromDataAnnotation ? ConfigurationSource.DataAnnotation : ConfigurationSource.Convention)
+            => (fromDataAnnotation ? ConfigurationSource.DataAnnotation : ConfigurationSource.Convention)
                 .Overrides(indexBuilder.Metadata.GetIncludePropertiesConfigurationSource())
                 || indexBuilder.Metadata.GetIncludeProperties() is var currentProperties
                 && ((propertyNames is null && currentProperties is null)
                     || (propertyNames is not null && currentProperties is not null && propertyNames.SequenceEqual(currentProperties)));
-        }
 
         /// <summary>
         ///     Configures whether the index is created with online option when targeting SQL Server.
@@ -259,8 +246,6 @@ public static bool CanSetIncludeProperties(
         /// <returns>A builder to further configure the index.</returns>
         public static IndexBuilder IsCreatedOnline(this IndexBuilder indexBuilder, bool createdOnline = true)
         {
-            Check.NotNull(indexBuilder, nameof(indexBuilder));
-
             indexBuilder.Metadata.SetIsCreatedOnline(createdOnline);
 
             return indexBuilder;
@@ -332,11 +317,7 @@ public static bool CanSetIsCreatedOnline(
             this IConventionIndexBuilder indexBuilder,
             bool? createdOnline,
             bool fromDataAnnotation = false)
-        {
-            Check.NotNull(indexBuilder, nameof(indexBuilder));
-
-            return indexBuilder.CanSetAnnotation(SqlServerAnnotationNames.CreatedOnline, createdOnline, fromDataAnnotation);
-        }
+            => indexBuilder.CanSetAnnotation(SqlServerAnnotationNames.CreatedOnline, createdOnline, fromDataAnnotation);
 
         /// <summary>
         ///     Configures whether the index is created with fill factor option when targeting SQL Server.
@@ -351,8 +332,6 @@ public static bool CanSetIsCreatedOnline(
         /// <returns>A builder to further configure the index.</returns>
         public static IndexBuilder HasFillFactor(this IndexBuilder indexBuilder, int fillFactor)
         {
-            Check.NotNull(indexBuilder, nameof(indexBuilder));
-
             indexBuilder.Metadata.SetFillFactor(fillFactor);
 
             return indexBuilder;
@@ -420,10 +399,6 @@ public static bool CanSetFillFactor(
             this IConventionIndexBuilder indexBuilder,
             int? fillFactor,
             bool fromDataAnnotation = false)
-        {
-            Check.NotNull(indexBuilder, nameof(indexBuilder));
-
-            return indexBuilder.CanSetAnnotation(SqlServerAnnotationNames.FillFactor, fillFactor, fromDataAnnotation);
-        }
+            => indexBuilder.CanSetAnnotation(SqlServerAnnotationNames.FillFactor, fillFactor, fromDataAnnotation);
     }
 }
diff --git a/src/EFCore.SqlServer/Extensions/SqlServerKeyBuilderExtensions.cs b/src/EFCore.SqlServer/Extensions/SqlServerKeyBuilderExtensions.cs
@@ -3,7 +3,6 @@
 
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.EntityFrameworkCore.SqlServer.Metadata.Internal;
-using Microsoft.EntityFrameworkCore.Utilities;
 
 // ReSharper disable once CheckNamespace
 namespace Microsoft.EntityFrameworkCore
@@ -31,8 +30,6 @@ public static class SqlServerKeyBuilderExtensions
         /// <returns>The same builder instance so that multiple calls can be chained.</returns>
         public static KeyBuilder IsClustered(this KeyBuilder keyBuilder, bool clustered = true)
         {
-            Check.NotNull(keyBuilder, nameof(keyBuilder));
-
             keyBuilder.Metadata.SetIsClustered(clustered);
 
             return keyBuilder;
@@ -99,10 +96,6 @@ public static bool CanSetIsClustered(
             this IConventionKeyBuilder keyBuilder,
             bool? clustered,
             bool fromDataAnnotation = false)
-        {
-            Check.NotNull(keyBuilder, nameof(keyBuilder));
-
-            return keyBuilder.CanSetAnnotation(SqlServerAnnotationNames.Clustered, clustered, fromDataAnnotation);
-        }
+            => keyBuilder.CanSetAnnotation(SqlServerAnnotationNames.Clustered, clustered, fromDataAnnotation);
     }
 }