Evolve null-checking approach in EFCore.Design (#26481)

dotnet · Nov 2, 2021 · ce751dc · ce751dc
1 parent 2427aee
commit ce751dc
Show file tree

Hide file tree

Showing 32 changed files with 14 additions and 522 deletions.
diff --git a/src/EFCore.Design/Design/Internal/CSharpHelper.cs b/src/EFCore.Design/Design/Internal/CSharpHelper.cs
@@ -12,7 +12,6 @@
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Internal;
 using Microsoft.EntityFrameworkCore.Storage;
-using Microsoft.EntityFrameworkCore.Utilities;
 
 namespace Microsoft.EntityFrameworkCore.Design.Internal
 {
@@ -161,9 +160,6 @@ public CSharpHelper(ITypeMappingSource typeMappingSource)
         /// </summary>
         public virtual string Lambda(IReadOnlyList<string> properties, string? lambdaIdentifier)
         {
-            Check.NotNull(properties, nameof(properties));
-            Check.NullButNotEmpty(lambdaIdentifier, nameof(lambdaIdentifier));
-
             lambdaIdentifier ??= "x";
             var builder = new StringBuilder();
             builder.Append(lambdaIdentifier);
@@ -194,8 +190,6 @@ public virtual string Lambda(IReadOnlyList<string> properties, string? lambdaIde
         /// </summary>
         public virtual string Reference(Type type, bool? fullName = null)
         {
-            Check.NotNull(type, nameof(type));
-
             fullName ??= type.IsNested ? ShouldUseFullName(type.DeclaringType!) : ShouldUseFullName(type);
 
             return type.DisplayName(fullName.Value, compilable: true);
@@ -227,8 +221,6 @@ public virtual bool ShouldUseFullName(string shortTypeName)
         /// </summary>
         public virtual string Identifier(string name, ICollection<string>? scope = null, bool? capitalize = null)
         {
-            Check.NotEmpty(name, nameof(name));
-
             var builder = new StringBuilder();
             var partStart = 0;
 
@@ -305,8 +297,6 @@ private static StringBuilder ChangeFirstLetterCase(StringBuilder builder, bool c
         /// </summary>
         public virtual string Namespace(params string[] name)
         {
-            Check.NotNull(name, nameof(name));
-
             var @namespace = new StringBuilder();
             foreach (var piece in name.Where(p => !string.IsNullOrEmpty(p))
                 .SelectMany(p => p.Split(new[] { '.' }, StringSplitOptions.RemoveEmptyEntries)))

diff --git a/src/EFCore.Design/Design/Internal/DatabaseOperations.cs b/src/EFCore.Design/Design/Internal/DatabaseOperations.cs
@@ -6,7 +6,6 @@
 using System.IO;
 using System.Reflection;
 using Microsoft.EntityFrameworkCore.Scaffolding;
-using Microsoft.EntityFrameworkCore.Utilities;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.EntityFrameworkCore.Design.Internal
@@ -43,10 +42,6 @@ public DatabaseOperations(
             bool nullable,
             string[]? args)
         {
-            Check.NotNull(reporter, nameof(reporter));
-            Check.NotNull(startupAssembly, nameof(startupAssembly));
-            Check.NotNull(projectDir, nameof(projectDir));
-
             _reporter = reporter;
             _projectDir = projectDir;
             _rootNamespace = rootNamespace;
@@ -79,11 +74,6 @@ public virtual SavedModelFiles ScaffoldContext(
             bool suppressOnConfiguring,
             bool noPluralize)
         {
-            Check.NotEmpty(provider, nameof(provider));
-            Check.NotEmpty(connectionString, nameof(connectionString));
-            Check.NotNull(schemas, nameof(schemas));
-            Check.NotNull(tables, nameof(tables));
-
             outputDir = outputDir != null
                 ? Path.GetFullPath(Path.Combine(_projectDir, outputDir))
                 : _projectDir;

diff --git a/src/EFCore.Design/Design/Internal/DbContextOperations.cs b/src/EFCore.Design/Design/Internal/DbContextOperations.cs
@@ -83,11 +83,6 @@ protected DbContextOperations(
             string[]? args,
             AppServiceProviderFactory appServicesFactory)
         {
-            Check.NotNull(reporter, nameof(reporter));
-            Check.NotNull(assembly, nameof(assembly));
-            Check.NotNull(startupAssembly, nameof(startupAssembly));
-            Check.NotNull(projectDir, nameof(projectDir));
-
             _reporter = reporter;
             _assembly = assembly;
             _startupAssembly = startupAssembly;

diff --git a/src/EFCore.Design/Design/Internal/DesignTimeServicesBuilder.cs b/src/EFCore.Design/Design/Internal/DesignTimeServicesBuilder.cs
@@ -50,7 +50,7 @@ public DesignTimeServicesBuilder(
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
         public virtual IServiceProvider Build(DbContext context)
-            => CreateServiceCollection(Check.NotNull(context, nameof(context))).BuildServiceProvider();
+            => CreateServiceCollection(context).BuildServiceProvider();
 
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
@@ -78,7 +78,7 @@ public virtual IServiceCollection CreateServiceCollection(DbContext context)
         ///     doing so can result in application failures when updating to a new Entity Framework Core release.
         /// </summary>
         public virtual IServiceProvider Build(string provider)
-            => CreateServiceCollection(Check.NotEmpty(provider, nameof(provider))).BuildServiceProvider();
+            => CreateServiceCollection(provider).BuildServiceProvider();
 
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to

diff --git a/src/EFCore.Design/Design/Internal/MigrationsOperations.cs b/src/EFCore.Design/Design/Internal/MigrationsOperations.cs
@@ -11,7 +11,6 @@
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.EntityFrameworkCore.Migrations.Design;
 using Microsoft.EntityFrameworkCore.Storage;
-using Microsoft.EntityFrameworkCore.Utilities;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Microsoft.EntityFrameworkCore.Design.Internal
@@ -50,11 +49,6 @@ public MigrationsOperations(
             bool nullable,
             string[]? args)
         {
-            Check.NotNull(reporter, nameof(reporter));
-            Check.NotNull(assembly, nameof(assembly));
-            Check.NotNull(startupAssembly, nameof(startupAssembly));
-            Check.NotNull(projectDir, nameof(projectDir));
-
             _reporter = reporter;
             _assembly = assembly;
             _projectDir = projectDir;
@@ -87,8 +81,6 @@ public virtual MigrationFiles AddMigration(
             string? contextType,
             string? @namespace)
         {
-            Check.NotEmpty(name, nameof(name));
-
             if (outputDir != null)
             {
                 outputDir = Path.GetFullPath(Path.Combine(_projectDir, outputDir));

diff --git a/src/EFCore.Design/Design/Internal/OperationLoggerProvider.cs b/src/EFCore.Design/Design/Internal/OperationLoggerProvider.cs
@@ -1,7 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using Microsoft.EntityFrameworkCore.Utilities;
 using Microsoft.Extensions.Logging;
 
 namespace Microsoft.EntityFrameworkCore.Design.Internal
@@ -24,8 +23,6 @@ public class OperationLoggerProvider : ILoggerProvider
         /// </summary>
         public OperationLoggerProvider(IOperationReporter reporter)
         {
-            Check.NotNull(reporter, nameof(reporter));
-
             _reporter = reporter;
         }
 

diff --git a/src/EFCore.Design/Design/OperationExecutor.cs b/src/EFCore.Design/Design/OperationExecutor.cs
@@ -703,8 +703,6 @@ public abstract class OperationBase : MarshalByRefObject
             /// <param name="resultHandler">The <see cref="IOperationResultHandler" />.</param>
             protected OperationBase(IOperationResultHandler resultHandler)
             {
-                Check.NotNull(resultHandler, nameof(resultHandler));
-
                 _resultHandler = resultHandler;
             }
 
@@ -714,8 +712,6 @@ protected OperationBase(IOperationResultHandler resultHandler)
             /// <param name="action">The action to execute.</param>
             protected virtual void Execute(Action action)
             {
-                Check.NotNull(action, nameof(action));
-
                 try
                 {
                     action();
@@ -732,23 +728,15 @@ protected virtual void Execute(Action action)
             /// <typeparam name="T">The result type.</typeparam>
             /// <param name="action">The action to execute.</param>
             protected virtual void Execute<T>(Func<T> action)
-            {
-                Check.NotNull(action, nameof(action));
-
-                Execute(() => _resultHandler.OnResult(action()));
-            }
+                => Execute(() => _resultHandler.OnResult(action()));
 
             /// <summary>
             ///     Executes an action passing results or exceptions to the <see cref="IOperationResultHandler" />.
             /// </summary>
             /// <typeparam name="T">The type of results.</typeparam>
             /// <param name="action">The action to execute.</param>
             protected virtual void Execute<T>(Func<IEnumerable<T>> action)
-            {
-                Check.NotNull(action, nameof(action));
-
-                Execute(() => _resultHandler.OnResult(action().ToArray()));
-            }
+                => Execute(() => _resultHandler.OnResult(action().ToArray()));
         }
     }
 }
diff --git a/src/EFCore.Design/Metadata/Internal/ScaffoldingEntityTypeAnnotations.cs b/src/EFCore.Design/Metadata/Internal/ScaffoldingEntityTypeAnnotations.cs
@@ -1,8 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using Microsoft.EntityFrameworkCore.Utilities;
-
 namespace Microsoft.EntityFrameworkCore.Metadata.Internal
 {
     /// <summary>
@@ -32,6 +30,6 @@ public static string GetDbSetName(this IReadOnlyEntityType entityType)
         public static void SetDbSetName(this IMutableEntityType entityType, string? value)
             => entityType.SetAnnotation(
                 ScaffoldingAnnotationNames.DbSetName,
-                Check.NullButNotEmpty(value, nameof(value)));
+                value);
     }
 }
diff --git a/src/EFCore.Design/Metadata/Internal/ScaffoldingModelExtensions.cs b/src/EFCore.Design/Metadata/Internal/ScaffoldingModelExtensions.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Collections.Generic;
-using Microsoft.EntityFrameworkCore.Utilities;
 
 namespace Microsoft.EntityFrameworkCore.Metadata.Internal
 {
@@ -50,7 +49,7 @@ public static IDictionary<string, string> GetOrCreateEntityTypeErrors(this IRead
         public static void SetEntityTypeErrors(this IMutableModel model, IDictionary<string, string> value)
             => model.SetAnnotation(
                 ScaffoldingAnnotationNames.EntityTypeErrors,
-                Check.NotNull(value, nameof(value)));
+                value);
 
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
@@ -70,6 +69,6 @@ public static void SetEntityTypeErrors(this IMutableModel model, IDictionary<str
         public static void SetDatabaseName(this IMutableModel model, string? value)
             => model.SetAnnotation(
                 ScaffoldingAnnotationNames.DatabaseName,
-                Check.NullButNotEmpty(value, nameof(value)));
+                value);
     }
 }