Nullable reference type annotations part 2 (graphql-dotnet#2599)

Author: Shane32

src/GraphQL.ApiTests/GraphQL.approved.txt

@@ -68,7 +68,7 @@ private async Task<IDictionary<string, IObservable<ExecutionResult>>> ExecuteSub
                 {
                     FieldAst = node.Field,
                     FieldDefinition = node.FieldDefinition,
-                    ParentType = node.GetParentType(context.Schema),
+                    ParentType = node.GetParentType(context.Schema)!,
                     Arguments = arguments,
                     Source = source,
                     Schema = context.Schema,
@@ -87,7 +87,7 @@ private async Task<IDictionary<string, IObservable<ExecutionResult>>> ExecuteSub
                 var eventStreamField = node.FieldDefinition as EventStreamFieldType;
 
 
-                IObservable<object> subscription;
+                IObservable<object?> subscription;
 
                 if (eventStreamField?.Subscriber != null)
                 {
@@ -103,7 +103,7 @@ private async Task<IDictionary<string, IObservable<ExecutionResult>>> ExecuteSub
                 }
 
                 return subscription
-                    .Select(value => BuildSubscriptionExecutionNode(node.Parent!, node.GraphType!, node.Field, node.FieldDefinition, node.IndexInParentNode, value))
+                    .Select(value => BuildSubscriptionExecutionNode(node.Parent!, node.GraphType!, node.Field, node.FieldDefinition, node.IndexInParentNode, value!))
                     .SelectMany(async executionNode =>
                     {
                         if (context.Listeners != null)

src/GraphQL.SystemReactive/SubscriptionExecutionStrategy.cs

@@ -361,7 +361,7 @@ public virtual void Resolve(Func<IResolveConnectionContext<TSourceType>, object>
         /// <summary>
         /// Sets the resolver method for the connection field.
         /// </summary>
-        public virtual void ResolveAsync(Func<IResolveConnectionContext<TSourceType>, Task<object>> resolver)
+        public virtual void ResolveAsync(Func<IResolveConnectionContext<TSourceType>, Task<object?>> resolver)
         {
             var isUnidirectional = !IsBidirectional;
             var pageSize = PageSizeFromMetadata;

src/GraphQL/Builders/ConnectionBuilder.cs

@@ -259,7 +259,7 @@ public virtual void Resolve(Func<IResolveConnectionContext<TSourceType>, TReturn
         /// Sets the resolver method for the connection field. This method must be called after
         /// <see cref="PageSize(int?)"/> and/or <see cref="Bidirectional"/> have been called.
         /// </summary>
-        public virtual void ResolveAsync(Func<IResolveConnectionContext<TSourceType>, Task<TReturnType>> resolver)
+        public virtual void ResolveAsync(Func<IResolveConnectionContext<TSourceType>, Task<TReturnType?>> resolver)
         {
             var isUnidirectional = !IsBidirectional;
             var pageSize = PageSizeFromMetadata;

src/GraphQL/Builders/ConnectionBuilder_Typed.cs

@@ -178,7 +178,7 @@ internal static void AddAppliedDirectivesField<TSourceType>(this ComplexGraphTyp
                description: $"Directives applied to the {element}",
                resolve: async context =>
                {
-                   if (context.Source.HasAppliedDirectives())
+                   if (context.Source!.HasAppliedDirectives())
                    {
                        var appliedDirectives = context.Source.GetAppliedDirectives();
                        var result = context.ArrayPool.Rent<AppliedDirective>(appliedDirectives!.Count);

src/GraphQL/DirectivesExtensions.cs

@@ -274,7 +274,7 @@ protected virtual ExecutionContext BuildExecutionContext(ExecutionOptions option
                 Operation = operation,
                 Variables = variables,
                 Errors = new ExecutionErrors(),
-                Extensions = new Dictionary<string, object>(),
+                Extensions = new Dictionary<string, object?>(),
                 CancellationToken = options.CancellationToken,
 
                 Metrics = metrics,

src/GraphQL/Execution/DocumentExecuter.cs

@@ -28,7 +28,7 @@ public class ExecutionContext : IExecutionContext, IExecutionArrayPool, IDisposa
         public object? RootValue { get; set; }
 
         /// <inheritdoc/>
-        public IDictionary<string, object> UserContext { get; set; }
+        public IDictionary<string, object?> UserContext { get; set; }
 
         /// <inheritdoc/>
         public Operation Operation { get; set; }
@@ -58,7 +58,7 @@ public class ExecutionContext : IExecutionContext, IExecutionArrayPool, IDisposa
         public int? MaxParallelExecutionCount { get; set; }
 
         /// <inheritdoc/>
-        public Dictionary<string, object> Extensions { get; set; }
+        public Dictionary<string, object?> Extensions { get; set; }
 #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
 
         /// <inheritdoc/>

src/GraphQL/Execution/ExecutionContext.cs

@@ -46,7 +46,7 @@ public class ExecutionOptions : IProvideUserContext
         public IEnumerable<IValidationRule>? ValidationRules { get; set; }
 
         /// <inheritdoc/>
-        public IDictionary<string, object> UserContext { get; set; } = new Dictionary<string, object>();
+        public IDictionary<string, object?> UserContext { get; set; } = new Dictionary<string, object?>();
 
         /// <summary>Complexity constraints for <see cref="IComplexityAnalyzer"/> to use to validate maximum query complexity</summary>
         public ComplexityConfiguration? ComplexityConfiguration { get; set; }

src/GraphQL/Execution/ExecutionOptions.cs

@@ -53,7 +53,7 @@ public class ExecutionResult
         /// <summary>
         /// Returns additional user-defined data; see <see cref="IExecutionContext.Extensions"/> and <see cref="IResolveFieldContext.Extensions"/>. This property is serialized as part of the GraphQL json response.
         /// </summary>
-        public Dictionary<string, object>? Extensions { get; set; }
+        public Dictionary<string, object?>? Extensions { get; set; }
 
         /// <summary>
         /// Initializes a new instance with all properties set to their defaults.

src/GraphQL/Execution/ExecutionResult.cs

@@ -85,7 +85,7 @@ public interface IExecutionContext : IProvideUserContext
         /// The response map may also contain an entry with key extensions. This entry is reserved for implementors to extend the
         /// protocol however they see fit, and hence there are no additional restrictions on its contents.
         /// </summary>
-        Dictionary<string, object> Extensions { get; }
+        Dictionary<string, object?> Extensions { get; }
 
         /// <summary>
         /// The service provider for the executing request. Typically this is a scoped service provider

src/GraphQL/Execution/IExecutionContext.cs

@@ -15,6 +15,6 @@ public interface IProvideUserContext
         /// A custom implementation of <see cref="IDictionary{TKey, TValue}">IDictionary</see> may be
         /// used in place of the default <see cref="Dictionary{TKey, TValue}">Dictionary</see>.
         /// </summary>
-        IDictionary<string, object> UserContext { get; }
+        IDictionary<string, object?> UserContext { get; }
     }
 }

src/GraphQL/Execution/IProvideUserContext.cs

@@ -1,3 +1,5 @@
+#nullable enable
+
 using System;
 using System.Collections.Generic;
 
@@ -95,22 +97,22 @@ public class ResolverTrace : OperationTrace
             /// <summary>
             /// Gets or sets the path of the field.
             /// </summary>
-            public List<object> Path { get; set; }
+            public List<object>? Path { get; set; }
 
             /// <summary>
             /// Gets or sets the parent graph type name.
             /// </summary>
-            public string ParentType { get; set; }
+            public string? ParentType { get; set; }
 
             /// <summary>
             /// Gets or sets the field name.
             /// </summary>
-            public string FieldName { get; set; }
+            public string? FieldName { get; set; }
 
             /// <summary>
             /// Gets or sets the returned graph type name.
             /// </summary>
-            public string ReturnType { get; set; }
+            public string? ReturnType { get; set; }
         }
     }
 }

src/GraphQL/Instrumentation/ApolloTrace.cs

@@ -1,3 +1,5 @@
+#nullable enable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -22,7 +24,7 @@ public static void EnrichWithApolloTracing(this ExecutionResult result, DateTime
         {
             var perf = result?.Perf;
             if (perf != null)
-                (result.Extensions ??= new Dictionary<string, object>())["tracing"] = CreateTrace(perf, start);
+                (result!.Extensions ??= new Dictionary<string, object?>())["tracing"] = CreateTrace(perf, start);
         }
 
         /// <summary>

src/GraphQL/Instrumentation/ApolloTracingExtensions.cs

@@ -1,3 +1,5 @@
+#nullable enable
+
 using System;
 using System.Threading.Tasks;
 using GraphQL.Resolvers;
@@ -9,7 +11,7 @@ namespace GraphQL.Instrumentation
     /// </summary>
     public class FieldMiddlewareBuilder : IFieldMiddlewareBuilder
     {
-        private Func<FieldMiddlewareDelegate, FieldMiddlewareDelegate> _middleware;
+        private Func<FieldMiddlewareDelegate, FieldMiddlewareDelegate>? _middleware;
 
         /// <inheritdoc/>
         public IFieldMiddlewareBuilder Use(Func<FieldMiddlewareDelegate, FieldMiddlewareDelegate> middleware)
@@ -33,7 +35,7 @@ public IFieldMiddlewareBuilder Use(Func<FieldMiddlewareDelegate, FieldMiddleware
         private static readonly FieldMiddlewareDelegate _defaultDelegate = context => Task.FromResult(NameFieldResolver.Instance.Resolve(context));
 
         /// <inheritdoc/>
-        public Func<FieldMiddlewareDelegate, FieldMiddlewareDelegate> Build()
+        public Func<FieldMiddlewareDelegate, FieldMiddlewareDelegate>? Build()
         {
             if (_middleware == null)
                 return null;

src/GraphQL/Instrumentation/FieldMiddlewareBuilder.cs

@@ -1,3 +1,5 @@
+#nullable enable
+
 using System;
 using GraphQL.Types;
 

src/GraphQL/Instrumentation/FieldMiddlewareBuilderExtensions.cs

@@ -1,3 +1,5 @@
+#nullable enable
+
 using System.Threading.Tasks;
 
 namespace GraphQL.Instrumentation
@@ -6,5 +8,5 @@ namespace GraphQL.Instrumentation
     /// Encapsulates a method that has a parameter of type <see cref="IResolveFieldContext"/> and
     /// asynchronously returns an object.
     /// </summary>
-    public delegate Task<object> FieldMiddlewareDelegate(IResolveFieldContext context);
+    public delegate Task<object?> FieldMiddlewareDelegate(IResolveFieldContext context);
 }

src/GraphQL/Instrumentation/FieldMiddlewareDelegate.cs

@@ -1,3 +1,5 @@
+#nullable enable
+
 using System.Threading.Tasks;
 
 namespace GraphQL.Instrumentation
@@ -13,6 +15,6 @@ public interface IFieldMiddleware
         /// <param name="context">Contains parameters pertaining to the currently executing field.</param>
         /// <param name="next">The delegate representing the remaining middleware and field resolver in the pipeline.</param>
         /// <returns>Asynchronously returns the result for the field.</returns>
-        Task<object> Resolve(IResolveFieldContext context, FieldMiddlewareDelegate next);
+        Task<object?> Resolve(IResolveFieldContext context, FieldMiddlewareDelegate next);
     }
 }

src/GraphQL/Instrumentation/IFieldMiddleware.cs

@@ -1,3 +1,5 @@
+#nullable enable
+
 using System;
 using GraphQL.Types;
 
@@ -21,6 +23,6 @@ public interface IFieldMiddlewareBuilder
         /// Returns a transform for field resolvers, or <see langword="null"/> if no middleware is defined.
         /// The transform is a cumulation of all middlewares configured within this builder.
         /// </summary>
-        Func<FieldMiddlewareDelegate, FieldMiddlewareDelegate> Build();
+        Func<FieldMiddlewareDelegate, FieldMiddlewareDelegate>? Build();
     }
 }

src/GraphQL/Instrumentation/IFieldMiddlewareBuilder.cs

@@ -1,3 +1,5 @@
+#nullable enable
+
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
@@ -9,9 +11,9 @@ namespace GraphQL.Instrumentation
     public class InstrumentFieldsMiddleware : IFieldMiddleware
     {
         /// <inheritdoc/>
-        public async Task<object> Resolve(IResolveFieldContext context, FieldMiddlewareDelegate next)
+        public async Task<object?> Resolve(IResolveFieldContext context, FieldMiddlewareDelegate next)
         {
-            var metadata = new Dictionary<string, object>
+            var metadata = new Dictionary<string, object?>
             {
                 { "typeName", context.ParentType.Name },
                 { "fieldName", context.FieldAst.Name },

src/GraphQL/Instrumentation/InstrumentFieldsMiddleware.cs

@@ -1,3 +1,5 @@
+#nullable enable
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -10,8 +12,8 @@ namespace GraphQL.Instrumentation
     public class Metrics
     {
         private ValueStopwatch _stopwatch;
-        private readonly List<PerfRecord> _records;
-        private PerfRecord _main;
+        private readonly List<PerfRecord>? _records;
+        private PerfRecord? _main;
 
         /// <summary>
         /// Gets an instance of the metrics for which metrics collection is disabled.
@@ -38,15 +40,15 @@ public Metrics(bool enabled = true)
         /// Logs the start of the execution.
         /// </summary>
         /// <param name="operationName">The name of the GraphQL operation.</param>
-        public Metrics Start(string operationName)
+        public Metrics Start(string? operationName)
         {
             if (Enabled)
             {
                 if (_main != null)
                     throw new InvalidOperationException("Metrics.Start has already been called");
 
                 _main = new PerfRecord("operation", operationName, 0);
-                _records.Add(_main);
+                _records!.Add(_main);
                 _stopwatch = ValueStopwatch.StartNew();
             }
 
@@ -56,7 +58,7 @@ public Metrics Start(string operationName)
         /// <summary>
         /// Sets the name of the GraphQL operation.
         /// </summary>
-        public Metrics SetOperationName(string name)
+        public Metrics SetOperationName(string? name)
         {
             if (Enabled && _main != null)
                 _main.Subject = name;
@@ -67,7 +69,7 @@ public Metrics SetOperationName(string name)
         /// <summary>
         /// Records an performance metric.
         /// </summary>
-        public Marker Subject(string category, string subject, Dictionary<string, object> metadata = null)
+        public Marker Subject(string category, string? subject, Dictionary<string, object?>? metadata = null)
         {
             if (!Enabled)
                 return Marker.Empty;
@@ -76,15 +78,15 @@ public Marker Subject(string category, string subject, Dictionary<string, object
                 throw new InvalidOperationException("Metrics.Start should be called before calling Metrics.Subject");
 
             var record = new PerfRecord(category, subject, _stopwatch.Elapsed.TotalMilliseconds, metadata);
-            lock (_records)
+            lock (_records!)
                 _records.Add(record);
             return new Marker(record, _stopwatch);
         }
 
         /// <summary>
         /// Returns the collected performance metrics.
         /// </summary>
-        public PerfRecord[] Finish()
+        public PerfRecord[]? Finish()
         {
             if (!Enabled)
                 return null;

src/GraphQL/Instrumentation/Metrics.cs

@@ -1,3 +1,5 @@
+#nullable enable
+
 using System.Collections.Generic;
 using System.Diagnostics;
 
@@ -12,7 +14,7 @@ public class PerfRecord
         /// <summary>
         /// Initializes a new instance with the specified properties.
         /// </summary>
-        public PerfRecord(string category, string subject, double start, Dictionary<string, object> metadata = null)
+        public PerfRecord(string category, string? subject, double start, Dictionary<string, object?>? metadata = null)
         {
             Category = category;
             Subject = subject;
@@ -33,12 +35,12 @@ public PerfRecord(string category, string subject, double start, Dictionary<stri
         /// <summary>
         /// Gets or sets the subject name.
         /// </summary>
-        public string Subject { get; set; }
+        public string? Subject { get; set; }
 
         /// <summary>
         /// Gets or sets a dictionary of additional metadata.
         /// </summary>
-        public Dictionary<string, object> Metadata { get; set; }
+        public Dictionary<string, object?>? Metadata { get; set; }
 
         /// <summary>
         /// Gets or sets the start time, represented as an offset in milliseconds from starting the GraphQL operation's execution.
@@ -59,10 +61,10 @@ public PerfRecord(string category, string subject, double start, Dictionary<stri
         /// Returns metadata for the specified key. Similar to <see cref="Metadata"/>[<paramref name="key"/>], but returns <c>default</c>
         /// if <see cref="Metadata"/> is <c>null</c> or the specified key does not exist.
         /// </summary>
-        public T MetaField<T>(string key)
+        public T? MetaField<T>(string key)
         {
             var local = Metadata;
-            return local != null && local.TryGetValue(key, out var value) ? (T)value : default;
+            return local != null && local.TryGetValue(key, out var value) ? (T?)value : default;
         }
     }
 }

src/GraphQL/Instrumentation/PerfRecord.cs

@@ -1,3 +1,5 @@
+#nullable enable
+
 using System;
 using System.Diagnostics;
 

src/GraphQL/Instrumentation/ValueStopwatch.cs

@@ -188,7 +188,7 @@ string GetPropertyName(string key, out FieldType? field)
         /// will have 'FirstName' key but its value should be set to 'FName' property of created object.
         /// </param>
         /// <remarks>There is special handling for strings, IEnumerable&lt;T&gt;, Nullable&lt;T&gt;, and Enum.</remarks>
-        public static object? GetPropertyValue(this object propertyValue, Type fieldType, IGraphType? mappedType = null)
+        public static object? GetPropertyValue(this object? propertyValue, Type fieldType, IGraphType? mappedType = null)
         {
             // Short-circuit conversion if the property value already of the right type
             if (propertyValue == null || fieldType == typeof(object) || fieldType.IsInstanceOfType(propertyValue))

src/GraphQL/ObjectExtensions.cs

@@ -1,3 +1,5 @@
+#nullable enable
+
 using System;
 using GraphQL.Resolvers;
 
@@ -14,7 +16,7 @@ public AccessorFieldResolver(IAccessor accessor, IServiceProvider serviceProvide
             _serviceProvider = serviceProvider;
         }
 
-        public object Resolve(IResolveFieldContext context)
+        public object? Resolve(IResolveFieldContext context)
         {
             var arguments = ReflectionHelper.BuildArguments(_accessor.Parameters, context);