Fixes

JamesNK · JamesNK · commit ec12b835e417 · 2020-12-22T13:58:37.000+13:00
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpHeaders.Generated.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpHeaders.Generated.cs
@@ -14221,4 +14221,4 @@ public bool MoveNext()
             }
         }
     }
-}
+}
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.Generated.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.Generated.cs
@@ -501,7 +501,7 @@ TFeature IFeatureCollection.Get<TFeature>()
                 feature = ConnectionFeatures.Get<TFeature>();
             }
 
-            return feature;
+            return feature!;
         }
 
         void IFeatureCollection.Set<TFeature>(TFeature feature)
diff --git a/src/Servers/Kestrel/Core/src/Internal/Infrastructure/HttpUtilities.Generated.cs b/src/Servers/Kestrel/Core/src/Internal/Infrastructure/HttpUtilities.Generated.cs
@@ -72,4 +72,4 @@ private static int GetKnownMethodIndex(ulong value)
             return ((tmp >> 2) | (tmp >> 23)) & 0xF;
         }
     }
-}
+}
diff --git a/src/Servers/Kestrel/shared/TransportConnection.Generated.cs b/src/Servers/Kestrel/shared/TransportConnection.Generated.cs
@@ -14,15 +14,15 @@ namespace Microsoft.AspNetCore.Connections
 {
     internal partial class TransportConnection : IFeatureCollection
     {
-        private object _currentIConnectionIdFeature;
-        private object _currentIConnectionTransportFeature;
-        private object _currentIConnectionItemsFeature;
-        private object _currentIMemoryPoolFeature;
-        private object _currentIConnectionLifetimeFeature;
+        private object? _currentIConnectionIdFeature;
+        private object? _currentIConnectionTransportFeature;
+        private object? _currentIConnectionItemsFeature;
+        private object? _currentIMemoryPoolFeature;
+        private object? _currentIConnectionLifetimeFeature;
 
         private int _featureRevision;
 
-        private List<KeyValuePair<Type, object>> MaybeExtra;
+        private List<KeyValuePair<Type, object>>? MaybeExtra;
 
         private void FastReset()
         {
@@ -42,7 +42,7 @@ internal void ResetFeatureCollection()
             _featureRevision++;
         }
 
-        private object ExtraFeatureGet(Type key)
+        private object? ExtraFeatureGet(Type key)
         {
             if (MaybeExtra == null)
             {
@@ -81,11 +81,11 @@ private void ExtraFeatureSet(Type key, object value)
 
         int IFeatureCollection.Revision => _featureRevision;
 
-        object IFeatureCollection.this[Type key]
+        object? IFeatureCollection.this[Type key]
         {
             get
             {
-                object feature = null;
+                object? feature = null;
                 if (key == typeof(IConnectionIdFeature))
                 {
                     feature = _currentIConnectionIdFeature;
@@ -140,7 +140,7 @@ object IFeatureCollection.this[Type key]
                 }
                 else
                 {
-                    ExtraFeatureSet(key, value);
+                    ExtraFeatureSet(key, value!); // TODO: What happens if you set an extra feature with a null value?
                 }
             }
         }
@@ -173,7 +173,7 @@ TFeature IFeatureCollection.Get<TFeature>()
                 feature = (TFeature?)(ExtraFeatureGet(typeof(TFeature)));
             }
 
-            return feature;
+            return feature!;
         }
 
         void IFeatureCollection.Set<TFeature>(TFeature feature)
@@ -201,7 +201,7 @@ void IFeatureCollection.Set<TFeature>(TFeature feature)
             }
             else
             {
-                ExtraFeatureSet(typeof(TFeature), feature);
+                ExtraFeatureSet(typeof(TFeature), feature!); // TODO: What happens if you set an extra feature with a null value?
             }
         }
 
diff --git a/src/Servers/Kestrel/shared/TransportMultiplexedConnection.Generated.cs b/src/Servers/Kestrel/shared/TransportMultiplexedConnection.Generated.cs
@@ -14,15 +14,15 @@ namespace Microsoft.AspNetCore.Connections
 {
     internal partial class TransportMultiplexedConnection : IFeatureCollection
     {
-        private object _currentIConnectionIdFeature;
-        private object _currentIConnectionTransportFeature;
-        private object _currentIConnectionItemsFeature;
-        private object _currentIMemoryPoolFeature;
-        private object _currentIConnectionLifetimeFeature;
+        private object? _currentIConnectionIdFeature;
+        private object? _currentIConnectionTransportFeature;
+        private object? _currentIConnectionItemsFeature;
+        private object? _currentIMemoryPoolFeature;
+        private object? _currentIConnectionLifetimeFeature;
 
         private int _featureRevision;
 
-        private List<KeyValuePair<Type, object>> MaybeExtra;
+        private List<KeyValuePair<Type, object>>? MaybeExtra;
 
         private void FastReset()
         {
@@ -42,7 +42,7 @@ internal void ResetFeatureCollection()
             _featureRevision++;
         }
 
-        private object ExtraFeatureGet(Type key)
+        private object? ExtraFeatureGet(Type key)
         {
             if (MaybeExtra == null)
             {
@@ -81,11 +81,11 @@ private void ExtraFeatureSet(Type key, object value)
 
         int IFeatureCollection.Revision => _featureRevision;
 
-        object IFeatureCollection.this[Type key]
+        object? IFeatureCollection.this[Type key]
         {
             get
             {
-                object feature = null;
+                object? feature = null;
                 if (key == typeof(IConnectionIdFeature))
                 {
                     feature = _currentIConnectionIdFeature;
@@ -140,40 +140,40 @@ object IFeatureCollection.this[Type key]
                 }
                 else
                 {
-                    ExtraFeatureSet(key, value);
+                    ExtraFeatureSet(key, value!); // TODO: What happens if you set an extra feature with a null value?
                 }
             }
         }
 
         TFeature IFeatureCollection.Get<TFeature>()
         {
-            TFeature feature = default;
+            TFeature? feature = default;
             if (typeof(TFeature) == typeof(IConnectionIdFeature))
             {
-                feature = (TFeature)_currentIConnectionIdFeature;
+                feature = (TFeature?)_currentIConnectionIdFeature;
             }
             else if (typeof(TFeature) == typeof(IConnectionTransportFeature))
             {
-                feature = (TFeature)_currentIConnectionTransportFeature;
+                feature = (TFeature?)_currentIConnectionTransportFeature;
             }
             else if (typeof(TFeature) == typeof(IConnectionItemsFeature))
             {
-                feature = (TFeature)_currentIConnectionItemsFeature;
+                feature = (TFeature?)_currentIConnectionItemsFeature;
             }
             else if (typeof(TFeature) == typeof(IMemoryPoolFeature))
             {
-                feature = (TFeature)_currentIMemoryPoolFeature;
+                feature = (TFeature?)_currentIMemoryPoolFeature;
             }
             else if (typeof(TFeature) == typeof(IConnectionLifetimeFeature))
             {
-                feature = (TFeature)_currentIConnectionLifetimeFeature;
+                feature = (TFeature?)_currentIConnectionLifetimeFeature;
             }
             else if (MaybeExtra != null)
             {
-                feature = (TFeature)(ExtraFeatureGet(typeof(TFeature)));
+                feature = (TFeature?)(ExtraFeatureGet(typeof(TFeature)));
             }
 
-            return feature;
+            return feature!;
         }
 
         void IFeatureCollection.Set<TFeature>(TFeature feature)
@@ -201,7 +201,7 @@ void IFeatureCollection.Set<TFeature>(TFeature feature)
             }
             else
             {
-                ExtraFeatureSet(typeof(TFeature), feature);
+                ExtraFeatureSet(typeof(TFeature), feature!); // TODO: What happens if you set an extra feature with a null value?
             }
         }
 
diff --git a/src/Servers/Kestrel/tools/CodeGenerator/HttpUtilities/HttpUtilities.cs b/src/Servers/Kestrel/tools/CodeGenerator/HttpUtilities/HttpUtilities.cs
@@ -68,6 +68,8 @@ private static string GenerateFile(Tuple<string, String>[] httpMethods)
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http;
 
+#nullable enable
+
 namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure
 {{
     internal static partial class HttpUtilities
diff --git a/src/Servers/Kestrel/tools/CodeGenerator/ReadOnlySpanStaticDataGenerator.cs b/src/Servers/Kestrel/tools/CodeGenerator/ReadOnlySpanStaticDataGenerator.cs
@@ -24,6 +24,8 @@ public static string GenerateFile(string namespaceName, string className, IEnume
 
 using System;
 
+#nullable enable
+
 namespace {namespaceName}
 {{
     internal partial class {className}

Original file line number	Diff line number	Diff line change
`@@ -14221,4 +14221,4 @@ public bool MoveNext()`
`14221`	`14221`	`}`
`14222`	`14222`	`}`
`14223`	`14223`	`}`
`14224`		`-}`
	`14224`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -501,7 +501,7 @@ TFeature IFeatureCollection.Get<TFeature>()`
`501`	`501`	`feature = ConnectionFeatures.Get<TFeature>();`
`502`	`502`	`}`
`503`	`503`
`504`		`- return feature;`
	`504`	`+ return feature!;`
`505`	`505`	`}`
`506`	`506`
`507`	`507`	`void IFeatureCollection.Set<TFeature>(TFeature feature)`
Original file line number	Diff line number	Diff line change
`@@ -72,4 +72,4 @@ private static int GetKnownMethodIndex(ulong value)`
`72`	`72`	`return ((tmp >> 2) \| (tmp >> 23)) & 0xF;`
`73`	`73`	`}`
`74`	`74`	`}`
`75`		`-}`
	`75`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -14,15 +14,15 @@ namespace Microsoft.AspNetCore.Connections`
`14`	`14`	`{`
`15`	`15`	`internal partial class TransportConnection : IFeatureCollection`
`16`	`16`	`{`
`17`		`- private object _currentIConnectionIdFeature;`
`18`		`- private object _currentIConnectionTransportFeature;`
`19`		`- private object _currentIConnectionItemsFeature;`
`20`		`- private object _currentIMemoryPoolFeature;`
`21`		`- private object _currentIConnectionLifetimeFeature;`
	`17`	`+ private object? _currentIConnectionIdFeature;`
	`18`	`+ private object? _currentIConnectionTransportFeature;`
	`19`	`+ private object? _currentIConnectionItemsFeature;`
	`20`	`+ private object? _currentIMemoryPoolFeature;`
	`21`	`+ private object? _currentIConnectionLifetimeFeature;`
`22`	`22`
`23`	`23`	`private int _featureRevision;`
`24`	`24`
`25`		`- private List<KeyValuePair<Type, object>> MaybeExtra;`
	`25`	`+ private List<KeyValuePair<Type, object>>? MaybeExtra;`
`26`	`26`
`27`	`27`	`private void FastReset()`
`28`	`28`	`{`
`@@ -42,7 +42,7 @@ internal void ResetFeatureCollection()`
`42`	`42`	`_featureRevision++;`
`43`	`43`	`}`
`44`	`44`
`45`		`- private object ExtraFeatureGet(Type key)`
	`45`	`+ private object? ExtraFeatureGet(Type key)`
`46`	`46`	`{`
`47`	`47`	`if (MaybeExtra == null)`
`48`	`48`	`{`
`@@ -81,11 +81,11 @@ private void ExtraFeatureSet(Type key, object value)`
`81`	`81`
`82`	`82`	`int IFeatureCollection.Revision => _featureRevision;`
`83`	`83`
`84`		`- object IFeatureCollection.this[Type key]`
	`84`	`+ object? IFeatureCollection.this[Type key]`
`85`	`85`	`{`
`86`	`86`	`get`
`87`	`87`	`{`
`88`		`- object feature = null;`
	`88`	`+ object? feature = null;`
`89`	`89`	`if (key == typeof(IConnectionIdFeature))`
`90`	`90`	`{`
`91`	`91`	`feature = _currentIConnectionIdFeature;`
`@@ -140,7 +140,7 @@ object IFeatureCollection.this[Type key]`
`140`	`140`	`}`
`141`	`141`	`else`
`142`	`142`	`{`
`143`		`- ExtraFeatureSet(key, value);`
	`143`	`+ ExtraFeatureSet(key, value!); // TODO: What happens if you set an extra feature with a null value?`
`144`	`144`	`}`
`145`	`145`	`}`
`146`	`146`	`}`
`@@ -173,7 +173,7 @@ TFeature IFeatureCollection.Get<TFeature>()`
`173`	`173`	`feature = (TFeature?)(ExtraFeatureGet(typeof(TFeature)));`
`174`	`174`	`}`
`175`	`175`
`176`		`- return feature;`
	`176`	`+ return feature!;`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`void IFeatureCollection.Set<TFeature>(TFeature feature)`
`@@ -201,7 +201,7 @@ void IFeatureCollection.Set<TFeature>(TFeature feature)`
`201`	`201`	`}`
`202`	`202`	`else`
`203`	`203`	`{`
`204`		`- ExtraFeatureSet(typeof(TFeature), feature);`
	`204`	`+ ExtraFeatureSet(typeof(TFeature), feature!); // TODO: What happens if you set an extra feature with a null value?`
`205`	`205`	`}`
`206`	`206`	`}`
`207`	`207`