Revert "Add support for routing messages based on attribute decoration"

src/Testing/CoreTests/Runtime/Green/Messages.cs

@@ -4,6 +4,4 @@ public class GreenMessage1;
 
 public class GreenMessage2;
 
-public class GreenMessage3;
-
-public class GreenAttribute : Attribute;
+public class GreenMessage3;

src/Testing/CoreTests/Runtime/Red/Messages.cs

@@ -1,16 +1,7 @@
 namespace CoreTests.Runtime.Red;
 
-[Red]
 public class RedMessage1;
 
-[Crimson]
 public class RedMessage2;
 
-[Burgundy]
-public class RedMessage3;
-
-public class RedAttribute : Attribute;
-
-public class CrimsonAttribute : RedAttribute;
-
-public class BurgundyAttribute : RedAttribute;
+public class RedMessage3;

src/Testing/CoreTests/Runtime/SubscriptionTester.cs

@@ -45,17 +45,6 @@ public void description_of_type_name_rule()
         rule.ToString().ShouldBe("Message name is 'CoreTests.Runtime.RandomClass'");
     }
 
-    [Fact]
-    public void description_of_attribute_rule()
-    {
-        var rule = new Subscription
-        {
-            BaseOrAttributeType = typeof(RandomClassAttribute),
-            Scope = RoutingScope.Attribute
-        };
-        rule.ToString().ShouldBe("Message type is decorated with 'CoreTests.Runtime.RandomClassAttribute' or a derived type");
-    }
-
     [Fact]
     public void description_of_all_types()
     {
@@ -96,20 +85,6 @@ public void positive_assembly_test()
         rule.Matches(typeof(DeleteUser)).ShouldBeTrue();
     }
 
-    [Fact]
-    public void negative_attribute_test()
-    {
-        var rule = new Subscription
-        {
-            Scope = RoutingScope.Attribute,
-            BaseOrAttributeType = typeof(GreenAttribute)
-        };
-
-        rule.Matches(typeof(GreenMessage1)).ShouldBeFalse();
-        rule.Matches(typeof(GreenMessage2)).ShouldBeFalse();
-        rule.Matches(typeof(GreenMessage3)).ShouldBeFalse();
-    }
-
     [Fact]
     public void positive_namespace_test()
     {
@@ -123,23 +98,6 @@ public void positive_namespace_test()
         rule.Matches(typeof(RedMessage2)).ShouldBeTrue();
         rule.Matches(typeof(RedMessage3)).ShouldBeTrue();
     }
-
-    [Fact]
-    public void positive_attribute_test()
-    {
-        var rule = new Subscription
-        {
-            Scope = RoutingScope.Attribute,
-            BaseOrAttributeType = typeof(RedAttribute)
-        };
-
-        rule.Matches(typeof(RedMessage1)).ShouldBeTrue();
-        rule.Matches(typeof(RedMessage2)).ShouldBeTrue();
-        rule.Matches(typeof(RedMessage3)).ShouldBeTrue();
-    }
 }
 
-[RandomClass]
-public class RandomClass;
-
-public class RandomClassAttribute : Attribute;
+public class RandomClass;

src/Wolverine/Configuration/PublishingExpression.cs

@@ -160,35 +160,6 @@ public PublishingExpression MessagesFromAssemblyContaining<T>()
         return MessagesFromAssembly(typeof(T).Assembly);
     }
 
-    /// <summary>
-    ///	    Create a publishing rule for all messages decorated with the specified attribute type or a derived type
-    /// </summary>
-    /// <param name="attributeType"></param>
-    /// <returns></returns>
-    public PublishingExpression MessagesDecoratedWith(Type attributeType)
-    {
-        AutoAddSubscriptions = true;
-
-        _subscriptions.Add(new Subscription()
-        {
-            Scope = RoutingScope.Attribute,
-            BaseOrAttributeType = attributeType,
-        });
-
-        return this;
-    }
-
-    /// <summary>
-    ///	    Create a publishing rule for all messages decorated with the attribute of type T or a derived type
-    /// </summary>
-    /// <typeparam name="T"></typeparam>
-    /// <returns></returns>
-    public PublishingExpression MessagesDecoratedWith<T>()
-        where T : Attribute
-    {
-        return MessagesDecoratedWith(typeof(T));
-    }
-
     internal void AttachSubscriptions()
     {
         if (!_endpoints.Any())
@@ -211,6 +182,6 @@ internal void AddSubscriptionForAllMessages()
     /// <typeparam name="T"></typeparam>
     public void MessagesImplementing<T>()
     {
-        _subscriptions.Add(new Subscription { BaseOrAttributeType = typeof(T), Scope = RoutingScope.Implements });
+        _subscriptions.Add(new Subscription { BaseType = typeof(T), Scope = RoutingScope.Implements });
     }
 }

src/Wolverine/Runtime/Routing/RoutingScope.cs

@@ -7,6 +7,5 @@ public enum RoutingScope
     Type,
     TypeName,
     All,
-    Implements,
-    Attribute
+    Implements
 }

src/Wolverine/Runtime/Routing/Subscription.cs

@@ -43,10 +43,7 @@ public string[] ContentTypes
     /// </summary>
     public string Match { get; init; } = string.Empty;
 
-    /// <summary>
-    ///     A base type if matching on implementation or an attribute type if matching on decoration
-    /// </summary>
-    public Type? BaseOrAttributeType { get; init; }
+    public Type? BaseType { get; init; }
 
     /// <summary>
     ///     Create a subscription for a specific message type
@@ -83,8 +80,7 @@ public bool Matches(Type type)
             RoutingScope.Type => type.Name.EqualsIgnoreCase(Match) || type.FullName!.EqualsIgnoreCase(Match) ||
                                  type.ToMessageTypeName().EqualsIgnoreCase(Match),
             RoutingScope.TypeName => type.ToMessageTypeName().EqualsIgnoreCase(Match),
-            RoutingScope.Implements => type.CanBeCastTo(BaseOrAttributeType!),
-            RoutingScope.Attribute => type.IsDefined(BaseOrAttributeType!, inherit: false),
+            RoutingScope.Implements => type.CanBeCastTo(BaseType!),
             _ => !type.CanBeCastTo<IAgentCommand>()
         };
     }
@@ -144,9 +140,6 @@ public override string ToString()
 
             case RoutingScope.TypeName:
                 return $"Message name is '{Match}'";
-
-            case RoutingScope.Attribute:
-                return $"Message type is decorated with '{BaseOrAttributeType?.FullName}' or a derived type";
         }
 
         throw new ArgumentOutOfRangeException();

src/Wolverine/Transports/Local/LocalTransport.cs

@@ -36,7 +36,7 @@ public LocalTransport() : base(TransportConstants.Local, "Local (In Memory)")
         var agentQueue = _queues[TransportConstants.Agents];
         agentQueue.TelemetryEnabled = false;
         agentQueue.Subscriptions.Add(new Subscription
-            { Scope = RoutingScope.Implements, BaseOrAttributeType = typeof(IAgentCommand) });
+            { Scope = RoutingScope.Implements, BaseType = typeof(IAgentCommand) });
         agentQueue.ExecutionOptions.MaxDegreeOfParallelism = 20;
         agentQueue.Role = EndpointRole.System;
         agentQueue.Mode = EndpointMode.BufferedInMemory;