API review updates

dotnet · Mar 27, 2023 · 4717f03 · 4717f03
1 parent a1855d0
commit 4717f03
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 19 deletions.
diff --git a/src/EFCore.Proxies/ProxiesExtensions.cs b/src/EFCore.Proxies/ProxiesExtensions.cs
@@ -141,15 +141,17 @@ public static DbContextOptionsBuilder UseLazyLoadingProxies(
     /// <returns>The same builder to allow method calls to be chained.</returns>
     public static DbContextOptionsBuilder UseLazyLoadingProxies(
         this DbContextOptionsBuilder optionsBuilder,
-        Action<LazyLoadingProxiesOptionsBuilder>? lazyLoadingProxiesOptionsAction)
+        Action<LazyLoadingProxiesOptionsBuilder> lazyLoadingProxiesOptionsAction)
     {
+        Check.NotNull(lazyLoadingProxiesOptionsAction, nameof(lazyLoadingProxiesOptionsAction));
+
         var extension = optionsBuilder.Options.FindExtension<ProxiesOptionsExtension>()
             ?? new ProxiesOptionsExtension();
 
         ((IDbContextOptionsBuilderInfrastructure)optionsBuilder).AddOrUpdateExtension(
             extension.WithLazyLoading(useLazyLoadingProxies: true));
 
-        lazyLoadingProxiesOptionsAction?.Invoke(new LazyLoadingProxiesOptionsBuilder(optionsBuilder));
+        lazyLoadingProxiesOptionsAction.Invoke(new LazyLoadingProxiesOptionsBuilder(optionsBuilder));
 
         return optionsBuilder;
     }
@@ -202,7 +204,7 @@ public static DbContextOptionsBuilder<TContext> UseLazyLoadingProxies<TContext>(
     /// <returns>The same builder to allow method calls to be chained.</returns>
     public static DbContextOptionsBuilder<TContext> UseLazyLoadingProxies<TContext>(
         this DbContextOptionsBuilder<TContext> optionsBuilder,
-        Action<LazyLoadingProxiesOptionsBuilder>? lazyLoadingProxiesOptionsAction)
+        Action<LazyLoadingProxiesOptionsBuilder> lazyLoadingProxiesOptionsAction)
         where TContext : DbContext
         => (DbContextOptionsBuilder<TContext>)UseLazyLoadingProxies((DbContextOptionsBuilder)optionsBuilder, lazyLoadingProxiesOptionsAction);
 

diff --git a/src/EFCore/ChangeTracking/CollectionEntry.cs b/src/EFCore/ChangeTracking/CollectionEntry.cs
@@ -216,7 +216,7 @@ public override bool IsModified
     ///     </para>
     /// </remarks>
     /// <param name="options">Options to control the way related entities are loaded.</param>
-    public override void Load(LoadOptions options = LoadOptions.Default)
+    public override void Load(LoadOptions options = LoadOptions.None)
     {
         EnsureInitialized();
 
@@ -244,7 +244,7 @@ public override void Load(LoadOptions options = LoadOptions.Default)
     /// <param name="cancellationToken">A <see cref="CancellationToken" /> to observe while waiting for the task to complete.</param>
     /// <returns>A task that represents the asynchronous save operation.</returns>
     /// <exception cref="OperationCanceledException">If the <see cref="CancellationToken" /> is canceled.</exception>
-    public override Task LoadAsync(LoadOptions options = LoadOptions.Default, CancellationToken cancellationToken = default)
+    public override Task LoadAsync(LoadOptions options = LoadOptions.None, CancellationToken cancellationToken = default)
     {
         EnsureInitialized();
 

diff --git a/src/EFCore/ChangeTracking/LoadOptions.cs b/src/EFCore/ChangeTracking/LoadOptions.cs
@@ -21,7 +21,7 @@ public enum LoadOptions
     ///         Use <see cref="ForceIdentityResolution" /> to avoid getting these duplicates.
     ///     </para>
     /// </summary>
-    Default = 0,
+    None = 0,
 
     /// <summary>
     ///     <para>

diff --git a/src/EFCore/ChangeTracking/NavigationEntry.cs b/src/EFCore/ChangeTracking/NavigationEntry.cs
@@ -95,7 +95,7 @@ private static INavigationBase GetNavigation(InternalEntityEntry internalEntry,
     ///     </para>
     /// </remarks>
     /// <param name="options">Options to control the way related entities are loaded.</param>
-    public abstract void Load(LoadOptions options = LoadOptions.Default);
+    public abstract void Load(LoadOptions options = LoadOptions.None);
 
     /// <summary>
     ///     Loads entities referenced by this navigation property, unless <see cref="NavigationEntry.IsLoaded" />
@@ -115,7 +115,7 @@ private static INavigationBase GetNavigation(InternalEntityEntry internalEntry,
     /// <param name="cancellationToken">A <see cref="CancellationToken" /> to observe while waiting for the task to complete.</param>
     /// <returns>A task that represents the asynchronous save operation.</returns>
     /// <exception cref="OperationCanceledException">If the <see cref="CancellationToken" /> is canceled.</exception>
-    public abstract Task LoadAsync(LoadOptions options = LoadOptions.Default, CancellationToken cancellationToken = default);
+    public abstract Task LoadAsync(LoadOptions options = LoadOptions.None, CancellationToken cancellationToken = default);
 
     /// <summary>
     ///     Returns the query that would be used by <see cref="Load" /> to load entities referenced by

diff --git a/src/EFCore/ChangeTracking/ReferenceEntry.cs b/src/EFCore/ChangeTracking/ReferenceEntry.cs
@@ -86,7 +86,7 @@ private void LocalDetectChanges()
     ///     </para>
     /// </remarks>
     /// <param name="options">Options to control the way related entities are loaded.</param>
-    public override void Load(LoadOptions options = LoadOptions.Default)
+    public override void Load(LoadOptions options = LoadOptions.None)
     {
         if (!IsLoaded)
         {
@@ -112,7 +112,7 @@ public override void Load(LoadOptions options = LoadOptions.Default)
     /// <param name="cancellationToken">A <see cref="CancellationToken" /> to observe while waiting for the task to complete.</param>
     /// <returns>A task that represents the asynchronous save operation.</returns>
     /// <exception cref="OperationCanceledException">If the <see cref="CancellationToken" /> is canceled.</exception>
-    public override Task LoadAsync(LoadOptions options = LoadOptions.Default, CancellationToken cancellationToken = default)
+    public override Task LoadAsync(LoadOptions options = LoadOptions.None, CancellationToken cancellationToken = default)
         => IsLoaded
             ? Task.CompletedTask
             : TargetFinder.LoadAsync((INavigation)Metadata, InternalEntry, options, cancellationToken);

diff --git a/src/EFCore/Infrastructure/Internal/LazyLoader.cs b/src/EFCore/Infrastructure/Internal/LazyLoader.cs
@@ -117,7 +117,7 @@ public virtual void Load(object entity, [CallerMemberName] string navigationName
                         entry.Load(
                             _queryTrackingBehavior == QueryTrackingBehavior.NoTrackingWithIdentityResolution
                                 ? LoadOptions.ForceIdentityResolution
-                                : LoadOptions.Default);
+                                : LoadOptions.None);
                     }
                     catch
                     {
@@ -161,7 +161,7 @@ public virtual async Task LoadAsync(
                         await entry.LoadAsync(
                             _queryTrackingBehavior == QueryTrackingBehavior.NoTrackingWithIdentityResolution
                                 ? LoadOptions.ForceIdentityResolution
-                                : LoadOptions.Default,
+                                : LoadOptions.None,
                             cancellationToken).ConfigureAwait(false);
                     }
                     catch

diff --git a/src/EFCore/Internal/EntityFinder.cs b/src/EFCore/Internal/EntityFinder.cs
@@ -639,7 +639,7 @@ public virtual IQueryable<TEntity> Query(INavigation navigation, InternalEntityE
             return _queryRoot.Where(e => false);
         }
 
-        return Query(navigation, keyValues, entry, LoadOptions.Default);
+        return Query(navigation, keyValues, entry, LoadOptions.None);
     }
 
     /// <summary>

diff --git a/src/EFCore/Internal/ManyToManyLoader.cs b/src/EFCore/Internal/ManyToManyLoader.cs
@@ -200,7 +200,7 @@ public virtual IQueryable<TEntity> Query(InternalEntityEntry entry)
             return queryRoot.Where(e => false);
         }
 
-        return Query(context, keyValues, entry, LoadOptions.Default);
+        return Query(context, keyValues, entry, LoadOptions.None);
     }
 
     private object[]? PrepareForLoad(InternalEntityEntry entry)

diff --git a/test/EFCore.Specification.Tests/ManyToManyLoadTestBase.cs b/test/EFCore.Specification.Tests/ManyToManyLoadTestBase.cs
@@ -422,11 +422,11 @@ public virtual async Task Load_collection_partially_loaded(EntityState state, bo
         {
             if (async)
             {
-                await collectionEntry.LoadAsync(forceIdentityResolution ? LoadOptions.ForceIdentityResolution : LoadOptions.Default);
+                await collectionEntry.LoadAsync(forceIdentityResolution ? LoadOptions.ForceIdentityResolution : LoadOptions.None);
             }
             else
             {
-                collectionEntry.Load(forceIdentityResolution ? LoadOptions.ForceIdentityResolution : LoadOptions.Default);
+                collectionEntry.Load(forceIdentityResolution ? LoadOptions.ForceIdentityResolution : LoadOptions.None);
             }
 
             Assert.True(collectionEntry.IsLoaded);
@@ -519,11 +519,11 @@ public virtual async Task Load_collection_partially_loaded_no_explicit_join(Enti
         {
             if (async)
             {
-                await collectionEntry.LoadAsync(forceIdentityResolution ? LoadOptions.ForceIdentityResolution : LoadOptions.Default);
+                await collectionEntry.LoadAsync(forceIdentityResolution ? LoadOptions.ForceIdentityResolution : LoadOptions.None);
             }
             else
             {
-                collectionEntry.Load(forceIdentityResolution ? LoadOptions.ForceIdentityResolution : LoadOptions.Default);
+                collectionEntry.Load(forceIdentityResolution ? LoadOptions.ForceIdentityResolution : LoadOptions.None);
             }
 
             Assert.True(collectionEntry.IsLoaded);
@@ -575,7 +575,7 @@ public virtual void Load_collection_partially_loaded_no_tracking(QueryTrackingBe
             collectionEntry.Load(
                 queryTrackingBehavior == QueryTrackingBehavior.NoTrackingWithIdentityResolution
                     ? LoadOptions.ForceIdentityResolution
-                    : LoadOptions.Default);
+                    : LoadOptions.None);
         }
 
         context.ChangeTracker.LazyLoadingEnabled = false;