Updated code to use the field keyword (#8335)

Author: glen-84

src/HotChocolate/Fusion-vnext/src/Fusion.Execution.Types/FusionComplexTypeDefinition.cs

@@ -13,8 +13,6 @@ public abstract class FusionComplexTypeDefinition : IComplexTypeDefinition
 {
     private FusionDirectiveCollection _directives = default!;
     private FusionInterfaceTypeDefinitionCollection _implements = default!;
-    private ISourceComplexTypeCollection<ISourceComplexType> _sources = default!;
-    private IFeatureCollection _features = FeatureCollection.Empty;
     private bool _completed;
 
     protected FusionComplexTypeDefinition(
@@ -95,7 +93,7 @@ IReadOnlyFieldDefinitionCollection<IOutputFieldDefinition> IComplexTypeDefinitio
     /// </value>
     public ISourceComplexTypeCollection<ISourceComplexType> Sources
     {
-        get => _sources;
+        get;
         private protected set
         {
             if (_completed)
@@ -104,13 +102,13 @@ private protected set
                     "The type definition is sealed and cannot be modified.");
             }
 
-            _sources = value;
+            field = value;
         }
-    }
+    } = default!;
 
     public IFeatureCollection Features
     {
-        get => _features;
+        get;
         private protected set
         {
             if (_completed)
@@ -119,9 +117,9 @@ private protected set
                     "The type definition is sealed and cannot be modified.");
             }
 
-            _features = value;
+            field = value;
         }
-    }
+    } = FeatureCollection.Empty;
 
     private protected void Complete()
     {

src/HotChocolate/Mutable/src/Types.Mutable/MutableInputFieldDefinition.cs

@@ -43,7 +43,7 @@ public string Name
     /// </summary>
     public ITypeSystemMember? DeclaringMember
     {
-        get => field;
+        get;
         set
         {
             if (value is not MutableInputObjectTypeDefinition

src/HotChocolate/Mutable/src/Types.Mutable/MutableOutputFieldDefinition.cs

@@ -9,7 +9,7 @@ namespace HotChocolate.Types.Mutable;
 /// <summary>
 /// Represents a GraphQL output field definition.
 /// </summary>
-public class MutableOutputFieldDefinition
+public class MutableOutputFieldDefinition(string name, IOutputType? type = null)
     : INamedTypeSystemMemberDefinition<MutableOutputFieldDefinition>
     , IOutputFieldDefinition
     , IMutableFieldDefinition
@@ -19,25 +19,13 @@ public class MutableOutputFieldDefinition
     private string? _deprecationReason;
     private DirectiveCollection? _directives;
     private InputFieldDefinitionCollection? _arguments;
-    private IOutputType _type;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="MutableOutputFieldDefinition"/> class.
-    /// </summary>
-    /// <param name="name">The name of the field.</param>
-    /// <param name="type">The type of the field.</param>
-    public MutableOutputFieldDefinition(string name, IOutputType? type = null)
-    {
-        Name = name;
-        _type = type ?? NotSetType.Default;
-    }
 
     /// <inheritdoc cref="IMutableFieldDefinition.Name" />
     public string Name
     {
-        get => field;
+        get;
         set => field = value.EnsureGraphQLName();
-    }
+    } = name;
 
     /// <inheritdoc cref="IMutableFieldDefinition.Description" />
     public string? Description { get; set; }
@@ -119,9 +107,9 @@ IReadOnlyFieldDefinitionCollection<IInputValueDefinition> IOutputFieldDefinition
     /// </value>
     public IOutputType Type
     {
-        get => _type;
-        set => _type = value.ExpectOutputType();
-    }
+        get;
+        set => field = value.ExpectOutputType();
+    } = type ?? NotSetType.Default;
 
     public FieldFlags Flags { get; set; }
 

src/HotChocolate/Mutable/src/Types.Mutable/MutableScalarTypeDefinition.cs

@@ -1,3 +1,4 @@
+using System.Diagnostics.CodeAnalysis;
 using HotChocolate.Features;
 using HotChocolate.Language;
 using HotChocolate.Utilities;
@@ -14,19 +15,17 @@ public class MutableScalarTypeDefinition(string name)
     , IMutableTypeDefinition
     , IFeatureProvider
 {
-    private string _name = name.EnsureGraphQLName();
     private DirectiveCollection? _directives;
-    private IFeatureCollection? _features;
 
     /// <inheritdoc />
     public TypeKind Kind => TypeKind.Scalar;
 
     /// <inheritdoc cref="IMutableTypeDefinition.Name" />
     public string Name
     {
-        get => _name;
-        set => _name = value.EnsureGraphQLName();
-    }
+        get;
+        set => field = value.EnsureGraphQLName();
+    } = name.EnsureGraphQLName();
 
     /// <inheritdoc cref="IMutableTypeDefinition.Description" />
     public string? Description { get; set; }
@@ -46,8 +45,9 @@ IReadOnlyDirectiveCollection IDirectivesProvider.Directives
         => _directives ?? EmptyCollections.Directives;
 
     /// <inheritdoc />
+    [field: AllowNull, MaybeNull]
     public IFeatureCollection Features
-        => _features ??= new FeatureCollection();
+        => field ??= new FeatureCollection();
 
     /// <inheritdoc />
     public bool Equals(IType? other)

src/HotChocolate/Mutable/src/Types.Mutable/MutableSchemaDefinition.cs

@@ -14,13 +14,6 @@ public class MutableSchemaDefinition
     , IFeatureProvider
 {
     private readonly List<SchemaCoordinate> _allDefinitionCoordinates = [];
-    private MutableObjectTypeDefinition? _queryType;
-    private MutableObjectTypeDefinition? _mutationType;
-    private MutableObjectTypeDefinition? _subscriptionType;
-    private TypeDefinitionCollection? _typeDefinitions;
-    private DirectiveDefinitionCollection? _directiveDefinitions;
-    private DirectiveCollection? _directives;
-    private IFeatureCollection? _features;
 
     /// <inheritdoc />
     public string Name { get; set; } = "default";
@@ -33,10 +26,10 @@ public class MutableSchemaDefinition
     /// </summary>
     public MutableObjectTypeDefinition? QueryType
     {
-        get => _queryType;
+        get;
         set
         {
-            _queryType = value;
+            field = value;
 
             if (value is not null && !Types.Contains(value))
             {
@@ -53,10 +46,10 @@ IObjectTypeDefinition ISchemaDefinition.QueryType
     /// </summary>
     public MutableObjectTypeDefinition? MutationType
     {
-        get => _mutationType;
+        get;
         set
         {
-            _mutationType = value;
+            field = value;
 
             if (value is not null && !Types.Contains(value))
             {
@@ -72,10 +65,10 @@ public MutableObjectTypeDefinition? MutationType
     /// </summary>
     public MutableObjectTypeDefinition? SubscriptionType
     {
-        get => _subscriptionType;
+        get;
         set
         {
-            _subscriptionType = value;
+            field = value;
 
             if (value is not null && !Types.Contains(value))
             {
@@ -89,30 +82,34 @@ public MutableObjectTypeDefinition? SubscriptionType
     /// <summary>
     /// Gets the types that are defined in this schema.
     /// </summary>
+    [field: AllowNull, MaybeNull]
     public TypeDefinitionCollection Types
-        => _typeDefinitions ??= new TypeDefinitionCollection(_allDefinitionCoordinates);
+        => field ??= new TypeDefinitionCollection(_allDefinitionCoordinates);
 
     IReadOnlyTypeDefinitionCollection ISchemaDefinition.Types => Types;
 
     /// <summary>
     /// Gets the directives that are defined in this schema.
     /// </summary>
+    [field: AllowNull, MaybeNull]
     public DirectiveDefinitionCollection DirectiveDefinitions
-        => _directiveDefinitions ??= new DirectiveDefinitionCollection(_allDefinitionCoordinates);
+        => field ??= new DirectiveDefinitionCollection(_allDefinitionCoordinates);
 
     IReadOnlyDirectiveDefinitionCollection ISchemaDefinition.DirectiveDefinitions => DirectiveDefinitions;
 
     /// <summary>
     /// Gets the directives that are annotated to this schema.
     /// </summary>
+    [field: AllowNull, MaybeNull]
     public DirectiveCollection Directives
-        => _directives ??= [];
+        => field ??= [];
 
     IReadOnlyDirectiveCollection IDirectivesProvider.Directives => Directives;
 
     /// <inheritdoc />
+    [field: AllowNull, MaybeNull]
     public IFeatureCollection Features
-        => _features ??= new FeatureCollection();
+        => field ??= new FeatureCollection();
 
     /// <summary>
     /// Tries to resolve a <see cref="ITypeSystemMember"/> by its <see cref="SchemaCoordinate"/>.

src/HotChocolate/Mutable/src/Types.Mutable/MutableUnionTypeDefinition.cs

@@ -29,7 +29,7 @@ public MutableUnionTypeDefinition(string name)
     /// <inheritdoc cref="IMutableTypeDefinition.Name" />
     public string Name
     {
-        get => field;
+        get;
         set => field = value.EnsureGraphQLName();
     }
 

src/HotChocolate/Mutable/src/Types.Mutable/TypeMetadata.cs

@@ -4,12 +4,11 @@ namespace HotChocolate.Types.Mutable;
 
 public sealed class TypeMetadata : ISealable
 {
-    private bool _isExtension;
     private bool _isReadOnly;
 
     public bool IsExtension
     {
-        get => _isExtension;
+        get;
         set
         {
             if (_isReadOnly)
@@ -18,7 +17,7 @@ public bool IsExtension
                     "The metadata is sealed and cannot be modified.");
             }
 
-            _isExtension = value;
+            field = value;
         }
     }