Move interface implement on class to generated (to match order)

Author: benaadams

src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.FeatureCollection.cs

@@ -16,23 +16,11 @@
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http
 {
-    internal partial class HttpProtocol : IHttpRequestFeature,
-                                          IHttpResponseFeature,
-                                          IHttpResponseBodyFeature,
-                                          IRouteValuesFeature,
-                                          IEndpointFeature,
-                                          IHttpRequestIdentifierFeature,
-                                          IHttpRequestTrailersFeature,
-                                          IHttpUpgradeFeature,
-                                          IRequestBodyPipeFeature,
-                                          IHttpConnectionFeature,
-                                          IHttpRequestLifetimeFeature,
-                                          IHttpBodyControlFeature,
-                                          IHttpMaxRequestBodySizeFeature,
-                                          IHttpRequestBodyDetectionFeature
+    internal partial class HttpProtocol
     {
         // NOTE: When feature interfaces are added to or removed from this HttpProtocol class implementation,
-        // then the list of `implementedFeatures` in the generated code project MUST also be updated.
+        // then the list of `implementedFeatures` in the generated code project MUST also be updated first
+        // and the code generator re-reun, which will change the interface list.
         // See also: tools/CodeGenerator/HttpProtocolFeatureCollection.cs
 
         string IHttpRequestFeature.Protocol

src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.Generated.cs

@@ -14,7 +14,21 @@
 
 namespace Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http
 {
-    internal partial class HttpProtocol : IFeatureCollection
+    internal partial class HttpProtocol : IFeatureCollection,
+                                          IHttpRequestFeature,
+                                          IHttpResponseFeature,
+                                          IHttpResponseBodyFeature,
+                                          IRouteValuesFeature,
+                                          IEndpointFeature,
+                                          IHttpRequestIdentifierFeature,
+                                          IHttpRequestTrailersFeature,
+                                          IHttpUpgradeFeature,
+                                          IRequestBodyPipeFeature,
+                                          IHttpConnectionFeature,
+                                          IHttpRequestLifetimeFeature,
+                                          IHttpBodyControlFeature,
+                                          IHttpMaxRequestBodySizeFeature,
+                                          IHttpRequestBodyDetectionFeature
     {
         // Implemented features
         internal protected IHttpRequestFeature? _currentIHttpRequestFeature;

src/Servers/Kestrel/shared/TransportConnection.FeatureCollection.cs

@@ -11,14 +11,11 @@
 
 namespace Microsoft.AspNetCore.Connections
 {
-    internal partial class TransportConnection : IConnectionIdFeature,
-                                                 IConnectionTransportFeature,
-                                                 IConnectionItemsFeature,
-                                                 IMemoryPoolFeature,
-                                                 IConnectionLifetimeFeature
+    internal partial class TransportConnection
     {
         // NOTE: When feature interfaces are added to or removed from this TransportConnection class implementation,
-        // then the list of `features` in the generated code project MUST also be updated.
+        // then the list of `features` in the generated code project MUST also be updated first
+        // and the code generator re-reun, which will change the interface list.
         // See also: tools/CodeGenerator/TransportConnectionFeatureCollection.cs
 
         MemoryPool<byte> IMemoryPoolFeature.MemoryPool => MemoryPool;

src/Servers/Kestrel/shared/TransportConnection.Generated.cs

@@ -13,7 +13,12 @@
 
 namespace Microsoft.AspNetCore.Connections
 {
-    internal partial class TransportConnection : IFeatureCollection
+    internal partial class TransportConnection : IFeatureCollection,
+                                                 IConnectionIdFeature,
+                                                 IConnectionTransportFeature,
+                                                 IConnectionItemsFeature,
+                                                 IMemoryPoolFeature,
+                                                 IConnectionLifetimeFeature
     {
         // Implemented features
         internal protected IConnectionIdFeature? _currentIConnectionIdFeature;
@@ -22,8 +27,6 @@ internal partial class TransportConnection : IFeatureCollection
         internal protected IMemoryPoolFeature? _currentIMemoryPoolFeature;
         internal protected IConnectionLifetimeFeature? _currentIConnectionLifetimeFeature;
 
-        // Other reserved feature slots
-
         private int _featureRevision;
 
         private List<KeyValuePair<Type, object>>? MaybeExtra;

src/Servers/Kestrel/shared/TransportMultiplexedConnection.FeatureCollection.cs

@@ -3,19 +3,16 @@
 
 using System.Buffers;
 using System.Collections.Generic;
-using System.IO.Pipelines;
 using System.Threading;
 using Microsoft.AspNetCore.Connections.Features;
 
 namespace Microsoft.AspNetCore.Connections
 {
-    internal partial class TransportMultiplexedConnection : IConnectionIdFeature,
-                                                 IConnectionItemsFeature,
-                                                 IMemoryPoolFeature,
-                                                 IConnectionLifetimeFeature
+    internal partial class TransportMultiplexedConnection
     {
         // NOTE: When feature interfaces are added to or removed from this TransportConnection class implementation,
-        // then the list of `features` in the generated code project MUST also be updated.
+        // then the list of `features` in the generated code project MUST also be updated first
+        // and the code generator re-reun, which will change the interface list.
         // See also: tools/CodeGenerator/TransportConnectionFeatureCollection.cs
 
         MemoryPool<byte> IMemoryPoolFeature.MemoryPool => MemoryPool;

src/Servers/Kestrel/shared/TransportMultiplexedConnection.Generated.cs

@@ -13,7 +13,11 @@
 
 namespace Microsoft.AspNetCore.Connections
 {
-    internal partial class TransportMultiplexedConnection : IFeatureCollection
+    internal partial class TransportMultiplexedConnection : IFeatureCollection,
+                                                            IConnectionIdFeature,
+                                                            IConnectionItemsFeature,
+                                                            IMemoryPoolFeature,
+                                                            IConnectionLifetimeFeature
     {
         // Implemented features
         internal protected IConnectionIdFeature? _currentIConnectionIdFeature;

src/Servers/Kestrel/tools/CodeGenerator/FeatureCollectionGenerator.cs

@@ -32,13 +32,14 @@ public static string GenerateFile(string namespaceName, string className, string
 
 namespace {namespaceName}
 {{
-    internal partial class {className} : IFeatureCollection
+    internal partial class {className} : IFeatureCollection{Each(implementedFeatures.Where(f => !skipResetFeatures.Contains(f)), feature => $@",
+                              {new string(' ', className.Length)}{feature}")}
     {{
         // Implemented features{Each(implementedFeatures.Where(f => !skipResetFeatures.Contains(f)), feature => $@"
         internal protected {feature}? _current{feature};")}{Each(implementedFeatures.Where(f => skipResetFeatures.Contains(f)), feature => $@"
-        internal protected {feature}? _current{feature};")}
+        internal protected {feature}? _current{feature};")}{(allFeatures.Where(f => !implementedFeatures.Contains(f)).FirstOrDefault() is not null ? @"
 
-        // Other reserved feature slots{Each(allFeatures.Where(f => !implementedFeatures.Contains(f)), feature => $@"
+        // Other reserved feature slots" : "")}{Each(allFeatures.Where(f => !implementedFeatures.Contains(f)), feature => $@"
         internal protected {feature}? _current{feature};")}
 
         private int _featureRevision;