More nullability annotations

Update pipeline, value generation, and many additional bits and pieces.
dotnet · Mar 2, 2021 · d116dcf · d116dcf
1 parent c65e02d
commit d116dcf
Show file tree

Hide file tree

Showing 134 changed files with 825 additions and 553 deletions.
diff --git a/src/EFCore.Cosmos/Diagnostics/Internal/CosmosLoggerExtensions.cs b/src/EFCore.Cosmos/Diagnostics/Internal/CosmosLoggerExtensions.cs
@@ -89,7 +89,7 @@ private static string ExecutingSqlQuery(EventDefinitionBase definition, EventDat
         public static void ExecutingReadItem(
             [NotNull] this IDiagnosticsLogger<DbLoggerCategory.Database.Command> diagnostics,
             [NotNull] string containerId,
-            [CanBeNull] string partitionKey,
+            [CanBeNull] string? partitionKey,
             [NotNull] string resourceId)
         {
             var definition = CosmosResources.LogExecutingReadItem(diagnostics);

diff --git a/src/EFCore.Cosmos/Extensions/CosmosDatabaseFacadeExtensions.cs b/src/EFCore.Cosmos/Extensions/CosmosDatabaseFacadeExtensions.cs
@@ -11,6 +11,8 @@
 using Microsoft.EntityFrameworkCore.Utilities;
 using Microsoft.Extensions.DependencyInjection;
 
+#nullable enable
+
 // ReSharper disable once CheckNamespace
 namespace Microsoft.EntityFrameworkCore
 {
@@ -55,8 +57,6 @@ private static TService GetService<TService>(IInfrastructure<IServiceProvider> d
         /// <param name="database"> The facade from <see cref="DbContext.Database" />. </param>
         /// <returns> <see langword="true" /> if the Cosmos provider is being used. </returns>
         public static bool IsCosmos([NotNull] this DatabaseFacade database)
-            => database.ProviderName.Equals(
-                typeof(CosmosOptionsExtension).Assembly.GetName().Name,
-                StringComparison.Ordinal);
+            => database.ProviderName == typeof(CosmosOptionsExtension).Assembly.GetName().Name;
     }
 }
diff --git a/src/EFCore.Cosmos/Extensions/CosmosDbContextOptionsExtensions.cs b/src/EFCore.Cosmos/Extensions/CosmosDbContextOptionsExtensions.cs
@@ -7,6 +7,8 @@
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Utilities;
 
+#nullable enable
+
 // ReSharper disable once CheckNamespace
 namespace Microsoft.EntityFrameworkCore
 {
@@ -30,7 +32,7 @@ public static DbContextOptionsBuilder<TContext> UseCosmos<TContext>(
             [NotNull] string accountEndpoint,
             [NotNull] string accountKey,
             [NotNull] string databaseName,
-            [CanBeNull] Action<CosmosDbContextOptionsBuilder> cosmosOptionsAction = null)
+            [CanBeNull] Action<CosmosDbContextOptionsBuilder>? cosmosOptionsAction = null)
             where TContext : DbContext
             => (DbContextOptionsBuilder<TContext>)UseCosmos(
                 (DbContextOptionsBuilder)optionsBuilder,
@@ -53,7 +55,7 @@ public static DbContextOptionsBuilder UseCosmos(
             [NotNull] string accountEndpoint,
             [NotNull] string accountKey,
             [NotNull] string databaseName,
-            [CanBeNull] Action<CosmosDbContextOptionsBuilder> cosmosOptionsAction = null)
+            [CanBeNull] Action<CosmosDbContextOptionsBuilder>? cosmosOptionsAction = null)
         {
             Check.NotNull(optionsBuilder, nameof(optionsBuilder));
             Check.NotNull(accountEndpoint, nameof(accountEndpoint));
@@ -88,7 +90,7 @@ public static DbContextOptionsBuilder<TContext> UseCosmos<TContext>(
             [NotNull] this DbContextOptionsBuilder<TContext> optionsBuilder,
             [NotNull] string connectionString,
             [NotNull] string databaseName,
-            [CanBeNull] Action<CosmosDbContextOptionsBuilder> cosmosOptionsAction = null)
+            [CanBeNull] Action<CosmosDbContextOptionsBuilder>? cosmosOptionsAction = null)
             where TContext : DbContext
             => (DbContextOptionsBuilder<TContext>)UseCosmos(
                 (DbContextOptionsBuilder)optionsBuilder,
@@ -108,7 +110,7 @@ public static DbContextOptionsBuilder UseCosmos(
             [NotNull] this DbContextOptionsBuilder optionsBuilder,
             [NotNull] string connectionString,
             [NotNull] string databaseName,
-            [CanBeNull] Action<CosmosDbContextOptionsBuilder> cosmosOptionsAction = null)
+            [CanBeNull] Action<CosmosDbContextOptionsBuilder>? cosmosOptionsAction = null)
         {
             Check.NotNull(optionsBuilder, nameof(optionsBuilder));
             Check.NotNull(connectionString, nameof(connectionString));

diff --git a/src/EFCore.Cosmos/Extensions/CosmosEntityTypeExtensions.cs b/src/EFCore.Cosmos/Extensions/CosmosEntityTypeExtensions.cs
@@ -77,7 +77,9 @@ public static void SetContainer(
                 ?? GetDefaultContainingPropertyName(entityType);
 
         private static string? GetDefaultContainingPropertyName(IReadOnlyEntityType entityType)
-            => entityType.FindOwnership()?.PrincipalToDependent!.Name;
+            => entityType.FindOwnership() is IReadOnlyForeignKey ownership
+                ? ownership.PrincipalToDependent!.Name
+                : null;
 
         /// <summary>
         ///     Sets the name of the parent property to which the entity type is mapped.

diff --git a/src/EFCore.Cosmos/Extensions/CosmosServiceCollectionExtensions.cs b/src/EFCore.Cosmos/Extensions/CosmosServiceCollectionExtensions.cs
@@ -18,6 +18,8 @@
 using Microsoft.EntityFrameworkCore.Utilities;
 using Microsoft.EntityFrameworkCore.ValueGeneration;
 
+#nullable enable
+
 // ReSharper disable once CheckNamespace
 namespace Microsoft.Extensions.DependencyInjection
 {
@@ -63,7 +65,7 @@ public static IServiceCollection AddEntityFrameworkCosmos([NotNull] this IServic
                 // New Query pipeline
                 .TryAdd<IQueryableMethodTranslatingExpressionVisitorFactory, CosmosQueryableMethodTranslatingExpressionVisitorFactory>()
                 .TryAdd<IShapedQueryCompilingExpressionVisitorFactory, CosmosShapedQueryCompilingExpressionVisitorFactory>()
-                .TryAdd<ISingletonOptions, ICosmosSingletonOptions>(p => p.GetService<ICosmosSingletonOptions>())
+                .TryAdd<ISingletonOptions, ICosmosSingletonOptions>(p => p.GetRequiredService<ICosmosSingletonOptions>())
                 .TryAdd<IQueryTranslationPreprocessorFactory, CosmosQueryTranslationPreprocessorFactory>()
                 .TryAdd<IQueryCompilationContextFactory, CosmosQueryCompilationContextFactory>()
                 .TryAdd<IQueryTranslationPostprocessorFactory, CosmosQueryTranslationPostprocessorFactory>()

diff --git a/src/EFCore.Cosmos/Storage/Internal/ByteArrayConverter.cs b/src/EFCore.Cosmos/Storage/Internal/ByteArrayConverter.cs
@@ -5,6 +5,8 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
+#nullable enable
+
 namespace Microsoft.EntityFrameworkCore.Cosmos.Storage.Internal
 {
     /// <summary>
@@ -23,7 +25,7 @@ public class ByteArrayConverter : JsonConverter
         /// </summary>
         public override void WriteJson(
             JsonWriter writer,
-            object value,
+            object? value,
             JsonSerializer serializer)
         {
             if (value == null)