Annotate metadata for nullability, leaving only builders and conventions

src/EFCore.Cosmos/Metadata/Internal/CosmosAnnotationNames.cs

@@ -1,6 +1,8 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+#nullable enable
+
 namespace Microsoft.EntityFrameworkCore.Cosmos.Metadata.Internal
 {
     /// <summary>

src/EFCore.Cosmos/Metadata/Internal/CosmosEntityTypeExtensions.cs

@@ -4,6 +4,8 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Metadata;
 
+#nullable enable
+
 namespace Microsoft.EntityFrameworkCore.Cosmos.Metadata.Internal
 {
     /// <summary>

src/EFCore.Cosmos/Metadata/Internal/CosmosNavigationExtensions.cs

@@ -4,6 +4,8 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Metadata;
 
+#nullable enable
+
 namespace Microsoft.EntityFrameworkCore.Cosmos.Metadata.Internal
 {
     /// <summary>

src/EFCore.Cosmos/Metadata/Internal/CosmosPropertyExtensions.cs

@@ -5,6 +5,8 @@
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Utilities;
 
+#nullable enable
+
 namespace Microsoft.EntityFrameworkCore.Cosmos.Metadata.Internal
 {
     /// <summary>
@@ -27,11 +29,11 @@ public static bool IsOrdinalKeyProperty([NotNull] this IProperty property)
                 property.DeclaringEntityType.IsOwned(), $"Expected {property.DeclaringEntityType.DisplayName()} to be owned.");
             Check.DebugAssert(property.GetJsonPropertyName().Length == 0, $"Expected {property.Name} to be non-persisted.");
 
-            return property.IsPrimaryKey()
+            return property.FindContainingPrimaryKey() is IKey key
+                && key.Properties.Count > 1
                 && !property.IsForeignKey()
                 && property.ClrType == typeof(int)
-                && property.ValueGenerated == ValueGenerated.OnAdd
-                && property.DeclaringEntityType.FindPrimaryKey().Properties.Count > 1;
+                && property.ValueGenerated == ValueGenerated.OnAdd;
         }
     }
 }

src/EFCore.Relational/Metadata/CheckConstraintExtensions.cs

@@ -5,6 +5,8 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 
+#nullable enable
+
 namespace Microsoft.EntityFrameworkCore.Metadata
 {
     /// <summary>

src/EFCore.Relational/Metadata/ColumnExtensions.cs

@@ -5,6 +5,8 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 
+#nullable enable
+
 namespace Microsoft.EntityFrameworkCore.Metadata
 {
     /// <summary>

src/EFCore.Relational/Metadata/ColumnMappingExtensions.cs

@@ -5,6 +5,8 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 
+#nullable enable
+
 namespace Microsoft.EntityFrameworkCore.Metadata
 {
     /// <summary>

src/EFCore.Relational/Metadata/DbFunctionExtensions.cs

@@ -6,6 +6,8 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 
+#nullable enable
+
 namespace Microsoft.EntityFrameworkCore.Metadata
 {
     /// <summary>

src/EFCore.Relational/Metadata/DbFunctionParameterExtensions.cs

@@ -5,6 +5,8 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 
+#nullable enable
+
 namespace Microsoft.EntityFrameworkCore.Metadata
 {
     /// <summary>

src/EFCore.Relational/Metadata/ForeignKeyConstraintExtensions.cs

@@ -7,6 +7,8 @@
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Microsoft.EntityFrameworkCore.Migrations;
 
+#nullable enable
+
 namespace Microsoft.EntityFrameworkCore.Metadata
 {
     /// <summary>

src/EFCore.Relational/Metadata/FunctionColumnExtensions.cs

@@ -5,6 +5,8 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 
+#nullable enable
+
 namespace Microsoft.EntityFrameworkCore.Metadata
 {
     /// <summary>

src/EFCore.Relational/Metadata/FunctionColumnMappingExtensions.cs

@@ -5,6 +5,8 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 
+#nullable enable
+
 namespace Microsoft.EntityFrameworkCore.Metadata
 {
     /// <summary>

src/EFCore.Relational/Metadata/FunctionMappingExtensions.cs

@@ -5,6 +5,8 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 
+#nullable enable
+
 namespace Microsoft.EntityFrameworkCore.Metadata
 {
     /// <summary>

src/EFCore.Relational/Metadata/ICheckConstraint.cs

@@ -3,6 +3,8 @@
 
 using Microsoft.EntityFrameworkCore.Infrastructure;
 
+#nullable enable
+
 namespace Microsoft.EntityFrameworkCore.Metadata
 {
     /// <summary>

src/EFCore.Relational/Metadata/IColumn.cs

@@ -4,6 +4,8 @@
 using System.Collections.Generic;
 using System.Linq;
 
+#nullable enable
+
 namespace Microsoft.EntityFrameworkCore.Metadata
 {
     /// <summary>
@@ -65,7 +67,7 @@ bool IsRowVersion
         /// <summary>
         ///     Returns the object that is used as the default value for this column.
         /// </summary>
-        public virtual object DefaultValue
+        public virtual object? DefaultValue
         {
             get
             {
@@ -82,14 +84,14 @@ public virtual object DefaultValue
         /// <summary>
         ///     Returns the SQL expression that is used as the default value for this column.
         /// </summary>
-        public virtual string DefaultValueSql
+        public virtual string? DefaultValueSql
             => PropertyMappings.First().Property
                 .GetDefaultValueSql(StoreObjectIdentifier.Table(Table.Name, Table.Schema));
 
         /// <summary>
         ///     Returns the SQL expression that is used as the computed value for this column.
         /// </summary>
-        public virtual string ComputedColumnSql
+        public virtual string? ComputedColumnSql
             => PropertyMappings.First().Property
                 .GetComputedColumnSql(StoreObjectIdentifier.Table(Table.Name, Table.Schema));
 
@@ -104,14 +106,14 @@ public virtual bool? IsStored
         /// <summary>
         ///     Comment for this column
         /// </summary>
-        public virtual string Comment
+        public virtual string? Comment
             => PropertyMappings.First().Property
                 .GetComment(StoreObjectIdentifier.Table(Table.Name, Table.Schema));
 
         /// <summary>
         ///     Collation for this column
         /// </summary>
-        public virtual string Collation
+        public virtual string? Collation
             => PropertyMappings.First().Property
                 .GetCollation(StoreObjectIdentifier.Table(Table.Name, Table.Schema));
     }

src/EFCore.Relational/Metadata/IColumnBase.cs

@@ -4,6 +4,8 @@
 using System.Collections.Generic;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 
+#nullable enable
+
 namespace Microsoft.EntityFrameworkCore.Metadata
 {
     /// <summary>

src/EFCore.Relational/Metadata/IColumnMapping.cs

@@ -1,6 +1,8 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+#nullable enable
+
 namespace Microsoft.EntityFrameworkCore.Metadata
 {
     /// <summary>

src/EFCore.Relational/Metadata/IColumnMappingBase.cs

@@ -4,6 +4,8 @@
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage;
 
+#nullable enable
+
 namespace Microsoft.EntityFrameworkCore.Metadata
 {
     /// <summary>

src/EFCore.Relational/Metadata/IConventionCheckConstraint.cs

@@ -1,6 +1,8 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+#nullable enable
+
 namespace Microsoft.EntityFrameworkCore.Metadata
 {
     /// <summary>

src/EFCore.Relational/Metadata/IConventionDbFunction.cs

@@ -8,6 +8,8 @@
 using Microsoft.EntityFrameworkCore.Query.SqlExpressions;
 using Microsoft.EntityFrameworkCore.Storage;
 
+#nullable enable
+
 namespace Microsoft.EntityFrameworkCore.Metadata
 {
     /// <summary>
@@ -24,7 +26,7 @@ public interface IConventionDbFunction : IConventionAnnotatable, IDbFunction
         /// <summary>
         ///     Gets the builder that can be used to configure this function.
         /// </summary>
-        new IConventionDbFunctionBuilder Builder { get; }
+        new IConventionDbFunctionBuilder? Builder { get; }
 
         /// <summary>
         ///     Gets the configuration source for this function.
@@ -38,7 +40,7 @@ public interface IConventionDbFunction : IConventionAnnotatable, IDbFunction
         /// <param name="name"> The name of the function in the database. </param>
         /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
         /// <returns> The configured value. </returns>
-        string SetName([CanBeNull] string name, bool fromDataAnnotation = false);
+        string? SetName([CanBeNull] string? name, bool fromDataAnnotation = false);
 
         /// <summary>
         ///     Gets the configuration source for <see cref="IDbFunction.Name" />.
@@ -52,7 +54,7 @@ public interface IConventionDbFunction : IConventionAnnotatable, IDbFunction
         /// <param name="schema"> The schema of the function in the database. </param>
         /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
         /// <returns> The configured value. </returns>
-        string SetSchema([CanBeNull] string schema, bool fromDataAnnotation = false);
+        string? SetSchema([CanBeNull] string? schema, bool fromDataAnnotation = false);
 
         /// <summary>
         ///     Gets the configuration source for <see cref="IDbFunction.Schema" />.
@@ -94,7 +96,7 @@ public interface IConventionDbFunction : IConventionAnnotatable, IDbFunction
         /// <param name="storeType"> The store type of the function in the database. </param>
         /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
         /// <returns> The configured value. </returns>
-        string SetStoreType([CanBeNull] string storeType, bool fromDataAnnotation = false);
+        string? SetStoreType([CanBeNull] string? storeType, bool fromDataAnnotation = false);
 
         /// <summary>
         ///     Gets the configuration source for <see cref="IDbFunction.StoreType" />.
@@ -108,7 +110,7 @@ public interface IConventionDbFunction : IConventionAnnotatable, IDbFunction
         /// <param name="typeMapping"> The type mapping of the function in the database. </param>
         /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
         /// <returns> The configured value. </returns>
-        RelationalTypeMapping SetTypeMapping([CanBeNull] RelationalTypeMapping typeMapping, bool fromDataAnnotation = false);
+        RelationalTypeMapping? SetTypeMapping([CanBeNull] RelationalTypeMapping? typeMapping, bool fromDataAnnotation = false);
 
         /// <summary>
         ///     Gets the configuration source for <see cref="IDbFunction.TypeMapping" />.
@@ -124,8 +126,8 @@ public interface IConventionDbFunction : IConventionAnnotatable, IDbFunction
         /// </param>
         /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
         /// <returns> The configured value. </returns>
-        Func<IReadOnlyCollection<SqlExpression>, SqlExpression> SetTranslation(
-            [CanBeNull] Func<IReadOnlyCollection<SqlExpression>, SqlExpression> translation,
+        Func<IReadOnlyCollection<SqlExpression>, SqlExpression>? SetTranslation(
+            [CanBeNull] Func<IReadOnlyCollection<SqlExpression>, SqlExpression>? translation,
             bool fromDataAnnotation = false);
 
         /// <summary>

src/EFCore.Relational/Metadata/IConventionDbFunctionParameter.cs

@@ -5,6 +5,8 @@
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.EntityFrameworkCore.Storage;
 
+#nullable enable
+
 namespace Microsoft.EntityFrameworkCore.Metadata
 {
     /// <summary>
@@ -20,7 +22,7 @@ public interface IConventionDbFunctionParameter : IConventionAnnotatable, IDbFun
         /// <summary>
         ///     The <see cref="IConventionDbFunctionParameterBuilder" /> for configuring this function parameter.
         /// </summary>
-        new IConventionDbFunctionParameterBuilder Builder { get; }
+        new IConventionDbFunctionParameterBuilder? Builder { get; }
 
         /// <summary>
         ///     Returns the configuration source for the parameter.
@@ -33,7 +35,7 @@ public interface IConventionDbFunctionParameter : IConventionAnnotatable, IDbFun
         /// </summary>
         /// <param name="storeType"> The store type of the parameter. </param>
         /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
-        string SetStoreType([CanBeNull] string storeType, bool fromDataAnnotation = false);
+        string? SetStoreType([CanBeNull] string? storeType, bool fromDataAnnotation = false);
 
         /// <summary>
         ///     Returns the configuration source for <see cref="IDbFunctionParameter.StoreType" />.
@@ -46,7 +48,7 @@ public interface IConventionDbFunctionParameter : IConventionAnnotatable, IDbFun
         /// </summary>
         /// <param name="typeMapping"> The type mapping of the parameter in the database. </param>
         /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
-        RelationalTypeMapping SetTypeMapping([CanBeNull] RelationalTypeMapping typeMapping, bool fromDataAnnotation = false);
+        RelationalTypeMapping? SetTypeMapping([CanBeNull] RelationalTypeMapping? typeMapping, bool fromDataAnnotation = false);
 
         /// <summary>
         ///     Returns the configuration source for <see cref="IDbFunctionParameter.TypeMapping" />.

src/EFCore.Relational/Metadata/IConventionSequence.cs

@@ -5,6 +5,8 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
+#nullable enable
+
 namespace Microsoft.EntityFrameworkCore.Metadata
 {
     /// <summary>
@@ -21,7 +23,7 @@ public interface IConventionSequence : ISequence, IConventionAnnotatable
         /// <summary>
         ///     Gets the builder that can be used to configure this sequence.
         /// </summary>
-        new IConventionSequenceBuilder Builder { get; }
+        new IConventionSequenceBuilder? Builder { get; }
 
         /// <summary>
         ///     Gets the configuration source for this <see cref="IConventionSequence" />.
@@ -91,7 +93,7 @@ public interface IConventionSequence : ISequence, IConventionAnnotatable
         /// <param name="type"> The <see cref="Type" /> of values returned by the sequence. </param>
         /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
         /// <returns> The configured value. </returns>
-        Type SetType([CanBeNull] Type type, bool fromDataAnnotation = false);
+        Type? SetType([CanBeNull] Type? type, bool fromDataAnnotation = false);
 
         /// <summary>
         ///     Gets the configuration source for <see cref="ISequence.ClrType" />.
@@ -106,7 +108,7 @@ public interface IConventionSequence : ISequence, IConventionAnnotatable
         /// <param name="fromDataAnnotation"> Indicates whether the configuration was specified using a data annotation. </param>
         /// <returns> The configured value. </returns>
         [Obsolete("Use SetType")]
-        Type SetClrType([CanBeNull] Type type, bool fromDataAnnotation = false);
+        Type? SetClrType([CanBeNull] Type? type, bool fromDataAnnotation = false);
 
         /// <summary>
         ///     Gets the configuration source for <see cref="ISequence.ClrType" />.