Fixed MassTransit#4397. Delegate IncludeInConfigureEndpoints on Endpo…

…intRegistration
RJSonnenberg · May 23, 2023 · e450919 · e450919
1 parent 1d6fc8f
commit e450919
Show file tree

Hide file tree

Showing 12 changed files with 112 additions and 96 deletions.
diff --git a/src/MassTransit/Configuration/DependencyInjection/IRegistrationConfigurator.cs b/src/MassTransit/Configuration/DependencyInjection/IRegistrationConfigurator.cs
@@ -129,7 +129,7 @@ IActivityRegistrationConfigurator<TActivity, TArguments, TLog> AddActivity<TActi
         /// <param name="endpointDefinition">The endpoint definition to add</param>
         void AddEndpoint(Type endpointDefinition);
 
-        void AddEndpoint<TDefinition, T>(IEndpointSettings<IEndpointDefinition<T>> settings = null)
+        void AddEndpoint<TDefinition, T>(IRegistration registration, IEndpointSettings<IEndpointDefinition<T>> settings = null)
             where TDefinition : class, IEndpointDefinition<T>
             where T : class;
 

diff --git a/...it/DependencyInjection/Configuration/DependencyInjectionEndpointRegistrationExtensions.cs b/...it/DependencyInjection/Configuration/DependencyInjectionEndpointRegistrationExtensions.cs
@@ -9,20 +9,20 @@ namespace MassTransit.Configuration
 
     public static class DependencyInjectionEndpointRegistrationExtensions
     {
-        public static IEndpointRegistration RegisterEndpoint<TDefinition, T>(this IServiceCollection collection,
+        public static IEndpointRegistration RegisterEndpoint<TDefinition, T>(this IServiceCollection collection, IRegistration registration,
             IEndpointSettings<IEndpointDefinition<T>> settings = null)
             where TDefinition : class, IEndpointDefinition<T>
             where T : class
         {
-            return RegisterEndpoint<TDefinition, T>(collection, new DependencyInjectionContainerRegistrar(collection), settings);
+            return RegisterEndpoint<TDefinition, T>(collection, new DependencyInjectionContainerRegistrar(collection), registration, settings);
         }
 
         public static IEndpointRegistration RegisterEndpoint<TDefinition, T>(this IServiceCollection collection, IContainerRegistrar registrar,
-            IEndpointSettings<IEndpointDefinition<T>> settings = null)
+            IRegistration registration, IEndpointSettings<IEndpointDefinition<T>> settings = null)
             where T : class
             where TDefinition : class, IEndpointDefinition<T>
         {
-            return new EndpointRegistrar<TDefinition, T>().Register(collection, registrar, settings);
+            return new EndpointRegistrar<TDefinition, T>(registration).Register(collection, registrar, settings);
         }
 
         public static IEndpointRegistration RegisterEndpoint(this IServiceCollection collection, Type endpointDefinitionType)
@@ -52,11 +52,18 @@ class EndpointRegistrar<TDefinition, T> :
             where TDefinition : class, IEndpointDefinition<T>
             where T : class
         {
+            readonly IRegistration _registration;
+
+            public EndpointRegistrar(IRegistration registration)
+            {
+                _registration = registration;
+            }
+
             public IEndpointRegistration Register(IServiceCollection collection, IContainerRegistrar registrar)
             {
                 collection.TryAddTransient<IEndpointDefinition<T>, TDefinition>();
 
-                return registrar.GetOrAdd<IEndpointRegistration>(typeof(T), _ => new EndpointRegistration<T>());
+                return registrar.GetOrAdd<IEndpointRegistration>(typeof(T), _ => new EndpointRegistration<T>(_registration));
             }
 
             public IEndpointRegistration Register(IServiceCollection collection, IContainerRegistrar registrar,
@@ -66,7 +73,7 @@ public IEndpointRegistration Register(IServiceCollection collection, IContainerR
                 if (settings != null)
                     collection.AddSingleton(settings);
 
-                return registrar.GetOrAdd<IEndpointRegistration>(typeof(T), _ => new EndpointRegistration<T>());
+                return registrar.GetOrAdd<IEndpointRegistration>(typeof(T), _ => new EndpointRegistration<T>(_registration));
             }
         }
     }

diff --git a/src/MassTransit/DependencyInjection/Configuration/RegistrationConfigurator.cs b/src/MassTransit/DependencyInjection/Configuration/RegistrationConfigurator.cs
@@ -153,11 +153,11 @@ public void AddEndpoint(Type definitionType)
             _collection.RegisterEndpoint(Registrar, definitionType);
         }
 
-        public void AddEndpoint<TDefinition, T>(IEndpointSettings<IEndpointDefinition<T>> settings)
+        public void AddEndpoint<TDefinition, T>(IRegistration registration, IEndpointSettings<IEndpointDefinition<T>> settings)
             where TDefinition : class, IEndpointDefinition<T>
             where T : class
         {
-            _collection.RegisterEndpoint<TDefinition, T>(Registrar, settings);
+            _collection.RegisterEndpoint<TDefinition, T>(Registrar, registration, settings);
         }
 
         public void AddRequestClient<T>(RequestTimeout timeout)

diff --git a/src/MassTransit/DependencyInjection/Configuration/TestHarnessRegistrationConfigurator.cs b/src/MassTransit/DependencyInjection/Configuration/TestHarnessRegistrationConfigurator.cs
@@ -169,11 +169,11 @@ public void AddEndpoint(Type endpointDefinition)
             _configurator.AddEndpoint(endpointDefinition);
         }
 
-        public void AddEndpoint<TDefinition, T>(IEndpointSettings<IEndpointDefinition<T>> settings = null)
+        public void AddEndpoint<TDefinition, T>(IRegistration registration, IEndpointSettings<IEndpointDefinition<T>> settings = null)
             where TDefinition : class, IEndpointDefinition<T>
             where T : class
         {
-            _configurator.AddEndpoint<TDefinition, T>(settings);
+            _configurator.AddEndpoint<TDefinition, T>(registration, settings);
         }
 
         public void AddRequestClient<T>(RequestTimeout timeout = default)

diff --git a/...yInjection/DependencyInjection/Registration/Activites/ActivityRegistrationConfigurator.cs b/...yInjection/DependencyInjection/Registration/Activites/ActivityRegistrationConfigurator.cs
@@ -34,7 +34,8 @@ public IActivityRegistrationConfigurator ExecuteEndpoint(Action<IEndpointRegistr
 
             configureExecute?.Invoke(configurator);
 
-            _configurator.AddEndpoint<ExecuteActivityEndpointDefinition<TActivity, TArguments>, IExecuteActivity<TArguments>>(configurator.Settings);
+            _configurator.AddEndpoint<ExecuteActivityEndpointDefinition<TActivity, TArguments>, IExecuteActivity<TArguments>>(_registration,
+                configurator.Settings);
 
             return this;
         }
@@ -48,7 +49,8 @@ public IActivityRegistrationConfigurator CompensateEndpoint(Action<IEndpointRegi
 
             configureCompensate?.Invoke(compensateConfigurator);
 
-            _configurator.AddEndpoint<CompensateActivityEndpointDefinition<TActivity, TLog>, ICompensateActivity<TLog>>(compensateConfigurator.Settings);
+            _configurator.AddEndpoint<CompensateActivityEndpointDefinition<TActivity, TLog>, ICompensateActivity<TLog>>(_registration,
+                compensateConfigurator.Settings);
 
             return this;
         }

diff --git a/...ion/DependencyInjection/Registration/Activites/ExecuteActivityRegistrationConfigurator.cs b/...ion/DependencyInjection/Registration/Activites/ExecuteActivityRegistrationConfigurator.cs
@@ -27,7 +27,8 @@ public void Endpoint(Action<IEndpointRegistrationConfigurator> configure)
 
             configure?.Invoke(configurator);
 
-            _configurator.AddEndpoint<ExecuteActivityEndpointDefinition<TActivity, TArguments>, IExecuteActivity<TArguments>>(configurator.Settings);
+            _configurator.AddEndpoint<ExecuteActivityEndpointDefinition<TActivity, TArguments>, IExecuteActivity<TArguments>>(_registration,
+                configurator.Settings);
         }
 
         public void ExcludeFromConfigureEndpoints()

diff --git a/...yInjection/DependencyInjection/Registration/Consumers/ConsumerRegistrationConfigurator.cs b/...yInjection/DependencyInjection/Registration/Consumers/ConsumerRegistrationConfigurator.cs
@@ -26,7 +26,7 @@ public void Endpoint(Action<IEndpointRegistrationConfigurator> configure)
 
             configure?.Invoke(configurator);
 
-            _configurator.AddEndpoint<ConsumerEndpointDefinition<TConsumer>, TConsumer>(configurator.Settings);
+            _configurator.AddEndpoint<ConsumerEndpointDefinition<TConsumer>, TConsumer>(_registration, configurator.Settings);
         }
 
         public void ExcludeFromConfigureEndpoints()

diff --git a/...it/DependencyInjection/DependencyInjection/Registration/Endpoints/EndpointRegistration.cs b/...it/DependencyInjection/DependencyInjection/Registration/Endpoints/EndpointRegistration.cs
@@ -9,11 +9,18 @@ public class EndpointRegistration<T> :
         IEndpointRegistration
         where T : class
     {
+        readonly IRegistration _registration;
+
+        public EndpointRegistration(IRegistration registration)
+        {
+            _registration = registration;
+        }
+
         public Type Type => typeof(T);
 
         public bool IncludeInConfigureEndpoints
         {
-            get => true;
+            get => _registration.IncludeInConfigureEndpoints;
             set { }
         }
 

diff --git a/...dencyInjection/DependencyInjection/Registration/Futures/FutureRegistrationConfigurator.cs b/...dencyInjection/DependencyInjection/Registration/Futures/FutureRegistrationConfigurator.cs
@@ -36,7 +36,7 @@ public IFutureRegistrationConfigurator<TFuture> Endpoint(Action<IEndpointRegistr
 
             configure?.Invoke(configurator);
 
-            _configurator.AddEndpoint<FutureEndpointDefinition<TFuture>, TFuture>(configurator.Settings);
+            _configurator.AddEndpoint<FutureEndpointDefinition<TFuture>, TFuture>(_registration, configurator.Settings);
 
             return this;
         }

diff --git a/...ependencyInjection/DependencyInjection/Registration/Sagas/SagaRegistrationConfigurator.cs b/...ependencyInjection/DependencyInjection/Registration/Sagas/SagaRegistrationConfigurator.cs
@@ -37,7 +37,7 @@ public ISagaRegistrationConfigurator<TSaga> Endpoint(Action<IEndpointRegistratio
 
             configure?.Invoke(configurator);
 
-            _configurator.AddEndpoint<SagaEndpointDefinition<TSaga>, TSaga>(configurator.Settings);
+            _configurator.AddEndpoint<SagaEndpointDefinition<TSaga>, TSaga>(_registration, configurator.Settings);
 
             return this;
         }

diff --git a/tests/MassTransit.Containers.Tests/ExcludeFromConfigureEndpoints_Specs.cs b/tests/MassTransit.Containers.Tests/ExcludeFromConfigureEndpoints_Specs.cs
@@ -34,11 +34,7 @@ public async Task Should_exclude_consumer_explicitly()
         public async Task Should_exclude_consumer_by_attribute()
         {
             await using var provider = new ServiceCollection()
-                .AddMassTransitTestHarness(x =>
-                {
-                    x.AddConsumer<ExcludedByAttributeConsumer>()
-                        .ExcludeFromConfigureEndpoints();
-                })
+                .AddMassTransitTestHarness(x => x.AddConsumer<ExcludedByAttributeConsumer>())
                 .BuildServiceProvider(true);
 
             var harness = provider.GetTestHarness();