{"results":{"result":{"added-files":{"code-health":9.77327678782895,"old-code-health":0.0,"files":[{"file":"src/Paramore.Brighter.SourceGenerators/BrighterRegistrationsGenerator.cs","loc":160,"code-health":10.0},{"file":"src/Paramore.Brighter.SourceGenerators/MarkerSymbols.cs","loc":38,"code-health":10.0},{"file":"src/Paramore.Brighter.SourceGenerators/Model/EquatableArray.cs","loc":42,"code-health":10.0},{"file":"src/Paramore.Brighter.SourceGenerators/Model/RegistrationModel.cs","loc":57,"code-health":9.6882083290695},{"file":"src/Paramore.Brighter.SourceGenerators/RegistrationWriter.cs","loc":128,"code-health":10.0},{"file":"src/Paramore.Brighter.SourceGenerators/SemanticModelReader.cs","loc":257,"code-health":9.387218218812514},{"file":"src/Paramore.Brighter.SourceGenerators/Model/PipelineModels.cs","loc":51,"code-health":10.0},{"file":"src/Paramore.Brighter.Extensions.DependencyInjection/BrighterBuilderExtensions.cs","loc":18,"code-health":10.0},{"file":"src/Paramore.Brighter.SourceGenerators/CodeWriter.cs","loc":22,"code-health":10.0}]},"external-review-url":"https://github.com/BrighterCommand/Brighter/pull/4138","old-code-health":8.816158827775617,"modified-files":{"code-health":8.816158827775617,"old-code-health":8.816158827775617,"files":[{"file":"src/Paramore.Brighter.Extensions.DependencyInjection/ServiceCollectionBrighterBuilder.cs","loc":186,"old-loc":179,"code-health":8.816158827775617,"old-code-health":8.816158827775617}]},"removed-files":{"code-health":0.0,"old-code-health":0.0,"files":[]},"external-review-id":"4138","analysis-time":"2026-06-05T11:49:03Z","negative-impact-count":3,"suppressions":{"number-of-types":0,"number-of-files-touched":0,"findings":[]},"affected-hotspots":0,"commits":["57fdcd270cc7512accf7cd2efbac7737f45beb9d","30a39ffe3182079ee56af1555b35a25cd8033b8a","5b45c44cfbbf7b6fb88c80b32cd20c330773b605","41f49d45605bb6d382b41361a264c934d01dc245","587a9243cdc442a98697b8d67eeaf85b19b10b9d","fe251bb3f82c2967a4c53a7a8daad4fe8f9b8ab8","af0f07006fe214d05a87b6490a2fee91a96021dd","1979663233e9a9d1424ccda9ac3a28df043bf72b","01abe331a0abeff9a81a75281bffa2ece16b7120","b69455040f357913e016d20d91167e0c60ec85a1","c7b1c4a9b7cb45e9106e278ab58be55fd7e310ab","c5c29e79f6f67a5587538dff3296021b9219cdb8","66d4116feb18d889fdb2c171d841e7847bbe39fa","e9a18ee878cb3ca02d84c13defa435338ba59e64","b563fdbc28ad1ca1d278cfa9167a0ae67ba401c9","6b565a2ed59d6a65fdef7390b531d64801aadc7b","c63b750987794b9e6c27a928d388459205ae50fe","cfc81569cf9372b7ba3fd079514fedeeffacc9bd","0c4c60e1e9433ea0ac303a6f44cf6c34470e55b5"],"is-negative-review":true,"negative-findings":{"number-of-types":3,"number-of-files-touched":2,"findings":[{"method":"RegistrationModel","why-it-occurs":"Functions with many arguments indicate either a) low cohesion where the function has too many responsibilities, or b) a missing abstraction that encapsulates those arguments.\n\nThe threshold for the C# language is 4 function arguments.","name":"Excess Number of Function Arguments","file":"src/Paramore.Brighter.SourceGenerators/Model/RegistrationModel.cs","refactoring-examples":[{"architectural-component-id":null,"author-name":"gabisonia","training-data":{"loc-added":"48","loc-deleted":"0","delta-cc-mean":"0.0","delta-cc-total":"0","delta-penalties":"1.0","delta-n-functions":"0","current-file-score":"10.0"},"author-email":"irakli.gabisonia94@gmail.com","commit-full-message":"Read MIME parameters without populating TrackingStringDictionary directly,\npreserve payload bytes through the Newtonsoft message constructors, and\nhonor configured ContentType converters for persisted format compatibility.\n\nAdd regression coverage for message round-trips, persisted JSON, malformed\nparameters, and custom converter compatibility.\n\nFixes #4149","commit-date":"2026-10-05T10:04:06Z","current-rev":"3ff94499a","filename":"Brighter/src/Paramore.Brighter/NJsonConverters/NContentTypePropertyConverter.cs","previous-rev":"29b2c7936","commit-title":"fix: restore Newtonsoft message content type compatibility","language":"C#","id":"e24e1f9b8afb6ef4e2033f779fb7b6ee4537006a","model-score":0.57,"author-id":null,"project-id":32198,"delta-file-score":0.31179166,"diff":"diff --git a/src/Paramore.Brighter/NJsonConverters/NRoutingKeyConverter.cs b/src/Paramore.Brighter/NJsonConverters/NContentTypePropertyConverter.cs\nindex 2ce350dc2..c9bd887ca 100644\n--- a/src/Paramore.Brighter/NJsonConverters/NRoutingKeyConverter.cs\n+++ b/src/Paramore.Brighter/NJsonConverters/NContentTypePropertyConverter.cs\n@@ -1,4 +1,5 @@\n-#region Licence\n+#region Licence\n+\n /* The MIT License (MIT)\n-Copyright © 2024 Ian Cooper \n+Copyright © 2026 Irakli Gabisonia \n \n@@ -6,3 +7,3 @@\n of this software and associated documentation files (the \"Software\"), to deal\n-in the Software without restriction, including without limitation the rights\n+in the Software without restriction, including but not limited to the rights\n to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\n@@ -24,3 +25,3 @@ THE SOFTWARE. */\n \n-using System;\n+using System.Net.Mime;\n using Newtonsoft.Json;\n@@ -29,24 +30,18 @@ namespace Paramore.Brighter.NJsonConverters;\n \n-public class NRoutingKeyConverter : JsonConverter\n+// A read-only property converter would suppress the caller's configured writers.\n+internal sealed class NContentTypePropertyConverter : NContentTypeConverter\n {\n- public override RoutingKey ReadJson(\n- JsonReader reader,\n- Type objectType,\n- RoutingKey? existingValue,\n- bool hasExistingValue,\n- JsonSerializer serializer)\n- {\n- return new RoutingKey(reader.Value as string ?? string.Empty);\n- }\n+ public override bool CanWrite => true;\n \n- public override void WriteJson(JsonWriter writer, RoutingKey? value, JsonSerializer serializer)\n+ public override void WriteJson(JsonWriter writer, ContentType? value, JsonSerializer serializer)\n {\n- if (value is null)\n+ JsonConverter? configuredConverter = GetConfiguredConverter(value?.GetType() ?? typeof(ContentType), serializer);\n+ if (configuredConverter?.CanWrite == true)\n {\n- writer.WriteNull();\n- }\n- else\n- {\n- writer.WriteValue(value.Value);\n+ // Re-entering the serializer for the same value would trigger its circular-reference check.\n+ configuredConverter.WriteJson(writer, value, serializer);\n+ return;\n }\n+\n+ serializer.Serialize(writer, value);\n }\n","improvement-type":"Excess Number of Function Arguments"},{"architectural-component-id":null,"author-name":"gabisonia","training-data":{"loc-added":"21","loc-deleted":"10","delta-cc-mean":"0.0","delta-cc-total":"0","delta-penalties":"1.0","delta-n-functions":"0","current-file-score":"7.862637358432501"},"author-email":"irakli.gabisonia94@gmail.com","commit-full-message":"","commit-date":"2026-10-05T16:23:25Z","current-rev":"54247e370","filename":"Brighter/src/Paramore.Brighter.Extensions.DependencyInjection/ServiceCollectionExtensions.cs","previous-rev":"91bee9216","commit-title":"fix(di): share resilience registry between handlers and producers","language":"C#","id":"e237dab6a8d0fb46e1a99b182b0d2255982ce876","model-score":0.33,"author-id":null,"project-id":32198,"delta-file-score":0.27965707,"diff":"diff --git a/src/Paramore.Brighter.Extensions.DependencyInjection/ServiceCollectionExtensions.cs b/src/Paramore.Brighter.Extensions.DependencyInjection/ServiceCollectionExtensions.cs\nindex 95db773c9..2140b0b85 100644\n--- a/src/Paramore.Brighter.Extensions.DependencyInjection/ServiceCollectionExtensions.cs\n+++ b/src/Paramore.Brighter.Extensions.DependencyInjection/ServiceCollectionExtensions.cs\n@@ -187,3 +187,3 @@ public static IBrighterBuilder BrighterHandlerBuilder(\n \n- var builder = new ServiceCollectionBrighterBuilder(\n+ var builder = new ServiceCollectionBrighterBuilder(\n services,\n@@ -195,2 +195,4 @@ public static IBrighterBuilder BrighterHandlerBuilder(\n \n+ RegisterResiliencePipelineRegistry(builder);\n+\n // Register built-in Brighter handlers, mappers, and transforms from Paramore.Brighter assemblies.\n@@ -253,4 +255,6 @@ private static void RegisterBrighterOptions(\n {\n- if (services is null) throw new ArgumentNullException(nameof(services));\n- if (optionsFunc is null) throw new ArgumentNullException(nameof(optionsFunc));\n+ if (services is null)\n+ throw new ArgumentNullException(nameof(services));\n+ if (optionsFunc is null)\n+ throw new ArgumentNullException(nameof(optionsFunc));\n \n@@ -277,2 +281,8 @@ private static void RegisterBrighterOptions(\n \n+ private static void RegisterResiliencePipelineRegistry(IBrighterBuilder builder)\n+ {\n+ builder.Services.TryAddSingleton(sp => new BrighterResiliencePipelineRegistry(\n+ sp.GetRequiredService(), builder.ResiliencePolicyRegistry));\n+ }\n+\n /// \n@@ -321,3 +331,3 @@ public static IBrighterBuilder AddProducers(\n \n- brighterBuilder.Services.TryAddSingleton();\n+ brighterBuilder.Services.TryAddSingleton();\n brighterBuilder.Services.TryAddSingleton(busConfiguration.ProducerRegistry);\n@@ -406,3 +416,3 @@ public static IBrighterBuilder AddProducers(\n brighterBuilder.Services.TryAddSingleton(busConfiguration);\n- brighterBuilder.ResiliencePolicyRegistry ??= new ResiliencePipelineRegistry().AddBrighterDefault();\n+ RegisterResiliencePipelineRegistry(brighterBuilder);\n \n@@ -410,3 +420,3 @@ public static IBrighterBuilder AddProducers(\n (serviceProvider) => BuildOutBoxProducerMediator(\n- serviceProvider, transactionType, busConfiguration, brighterBuilder.ResiliencePolicyRegistry, outbox\n+ serviceProvider, transactionType, busConfiguration, outbox\n ) ?? throw new ConfigurationException(\"Unable to create an outbox producer mediator. Ensure IAmProducersConfiguration, IAmABoxTransactionProvider, and IAmAnOutbox are registered.\"),\n@@ -469,3 +479,3 @@ public static IBrighterBuilder AddProducers(\n \n- brighterBuilder.Services.TryAddSingleton();\n+ brighterBuilder.Services.TryAddSingleton();\n \n@@ -544,3 +554,3 @@ public static IBrighterBuilder AddProducers(\n \n- brighterBuilder.ResiliencePolicyRegistry ??= new ResiliencePipelineRegistry().AddBrighterDefault();\n+ RegisterResiliencePipelineRegistry(brighterBuilder);\n \n@@ -561,3 +571,3 @@ public static IBrighterBuilder AddProducers(\n Outbox = outbox\n- }, brighterBuilder.ResiliencePolicyRegistry, outbox\n+ }, outbox\n ) ?? throw new ConfigurationException(\"Unable to create an outbox producer mediator. Ensure IAmProducersConfiguration, IAmABoxTransactionProvider, and IAmAnOutbox are registered.\");\n@@ -717,3 +727,4 @@ private static INeedInstrumentation AddEventBus(\n \n- if (!hasEventBus) instrumentationBuilder = messagingBuilder.NoExternalBus();\n+ if (!hasEventBus)\n+ instrumentationBuilder = messagingBuilder.NoExternalBus();\n \n@@ -787,5 +798,5 @@ private static IAmACommandProcessor BuildCommandProcessor(IServiceProvider provi\n \n- options.ResiliencePipelineRegistry ??= new ResiliencePipelineRegistry().AddBrighterDefault();\n+ var resiliencePipelineRegistry = provider.GetRequiredService().Registry;\n #pragma warning disable CS0618 // Type or member is obsolete\n- var messagingBuilder = pollyBuilder.Resilience(options.ResiliencePipelineRegistry, options.PolicyRegistry);\n+ var messagingBuilder = pollyBuilder.Resilience(resiliencePipelineRegistry, options.PolicyRegistry);\n #pragma warning restore CS0618 // Type or member is obsolete\n@@ -812,5 +823,5 @@ private static IAmACommandProcessor BuildCommandProcessor(IServiceProvider provi\n ProducersConfiguration busConfiguration,\n- ResiliencePipelineRegistry? resiliencePipelineRegistry,\n IAmAnOutbox outbox) \n {\n+ var resiliencePipelineRegistry = serviceProvider.GetRequiredService().Registry;\n //Because the bus has specialized types as members, we need to create the bus type dynamically\n@@ -903,3 +914,3 @@ private static void RegisterConnectionAndTransactionProvider(IBrighterBuilder br\n var connectionProviderInterface = GetConnectionProviderInterface(connectionProvider);\n- if(connectionProviderInterface != null)\n+ if (connectionProviderInterface != null)\n {\n@@ -907,4 +918,4 @@ private static void RegisterConnectionAndTransactionProvider(IBrighterBuilder br\n \n- var transactionProviderInterface = GetTransactionInterface(transactionProvider, connectionProviderInterface );\n- if(transactionProviderInterface != null)\n+ var transactionProviderInterface = GetTransactionInterface(transactionProvider, connectionProviderInterface);\n+ if (transactionProviderInterface != null)\n {\n","improvement-type":"Excess Number of Function Arguments"},{"architectural-component-id":null,"author-name":"DevJonny","training-data":{"loc-added":"20","loc-deleted":"14","delta-cc-mean":"0.0","delta-cc-total":"0","delta-penalties":"1.0","delta-n-functions":"0","current-file-score":"7.534418959981518"},"author-email":"jonny.ollifflee@gmail.com","commit-full-message":"JSON and YAML outputs previously described different documents because Neuroglia\n4.20.0 applies different default naming conventions in its JSON and YAML serialisers,\nand embedded JSON Schema fragments emitted PascalCase property names that did not\nmatch Brighter's camelCase wire format.\n\nLibrary changes:\n\n- Derive YAML from the JSON tree we just wrote. Guarantees both formats describe the\n same document, regardless of upstream serialiser config drift.\n- Strip Neuroglia internals (isReference) and empty collections from both outputs.\n- Switch NJsonSchema generator to System.Text.Json reflection with camelCase property\n policy and JsonStringEnumConverter, mirroring JsonSerialisationOptions.Options. The\n schema now describes what JsonMessageMapper actually puts on the wire.\n- Declare draft-04 in SchemaFormat to match what NJsonSchema 11.x emits\n (JsonSchema.ToJson hardcodes the dialect).\n- Refactor ProcessSourceAsync to take a MessageSource record, resolving the CodeScene\n excess-arguments check.\n- Backfill missing XML docs on AsyncApiOptions and fix a stale paramref on\n IAmASchemaGenerator.\n\nSample fix:\n\n- Kafka sample no longer requires a live broker for --generate-asyncapi.\n KafkaProducerRegistryFactory.Create connects eagerly, so build it only on the\n runtime path; assembly scanning still surfaces publications in the doc.\n\nTests: 46/46 pass on net9.0 and net10.0.\n\nCo-Authored-By: Claude ","commit-date":"2026-05-16T19:01:42Z","current-rev":"5e03da283","filename":"Brighter/src/Paramore.Brighter.AsyncAPI/AsyncApiDocumentGenerator.cs","previous-rev":"70b03a0ee","commit-title":"fix(#3828): align AsyncAPI output with wire format, eliminate JSON/YAML divergence","language":"C#","id":"f49c3320ae617404ccf0324e7fe2dad4565432c7","model-score":0.28,"author-id":null,"project-id":32198,"delta-file-score":0.22637527,"diff":"diff --git a/src/Paramore.Brighter.AsyncAPI/AsyncApiDocumentGenerator.cs b/src/Paramore.Brighter.AsyncAPI/AsyncApiDocumentGenerator.cs\nindex 2a306a512..bd7ae8957 100644\n--- a/src/Paramore.Brighter.AsyncAPI/AsyncApiDocumentGenerator.cs\n+++ b/src/Paramore.Brighter.AsyncAPI/AsyncApiDocumentGenerator.cs\n@@ -51,2 +51,10 @@ private sealed record GenerationContext(\n \n+ // Inputs that vary per call into ProcessSourceAsync. Grouping them keeps the method\n+ // signature small (and satisfies the CodeScene \"Excess Number of Function Arguments\"\n+ // check) without flattening the call sites with positional parameters.\n+ private sealed record MessageSource(\n+ string Address,\n+ V3OperationAction Action,\n+ Type? RequestType);\n+\n private readonly AsyncApiOptions _options;\n@@ -116,3 +124,3 @@ private async Task AddSubscriptionsAsync(\n await ProcessSourceAsync(\n- subscription.RoutingKey.Value, V3OperationAction.Receive, subscription.RequestType,\n+ new MessageSource(subscription.RoutingKey.Value, V3OperationAction.Receive, subscription.RequestType),\n context, ct).ConfigureAwait(false);\n@@ -133,3 +141,3 @@ private async Task AddPublicationsAsync(\n await ProcessSourceAsync(\n- publication.Topic.Value, V3OperationAction.Send, publication.RequestType,\n+ new MessageSource(publication.Topic.Value, V3OperationAction.Send, publication.RequestType),\n context, ct).ConfigureAwait(false);\n@@ -139,5 +147,3 @@ await ProcessSourceAsync(\n private async Task ProcessSourceAsync(\n- string address,\n- V3OperationAction action,\n- Type? requestType,\n+ MessageSource source,\n GenerationContext context,\n@@ -145,11 +151,11 @@ private async Task ProcessSourceAsync(\n {\n- var channelId = SanitizeChannelId(address);\n+ var channelId = SanitizeChannelId(source.Address);\n \n- EnsureChannel(context.Channels, channelId, address);\n+ EnsureChannel(context.Channels, channelId, source.Address);\n \n string messageName;\n- if (requestType != null)\n+ if (source.RequestType != null)\n {\n- messageName = requestType.Name;\n- await EnsureMessageAsync(context.Messages, messageName, requestType, ct).ConfigureAwait(false);\n+ messageName = source.RequestType.Name;\n+ await EnsureMessageAsync(context.Messages, messageName, source.RequestType, ct).ConfigureAwait(false);\n }\n@@ -163,3 +169,3 @@ private async Task ProcessSourceAsync(\n \n- var actionString = action == V3OperationAction.Send ? \"send\" : \"receive\";\n+ var actionString = source.Action == V3OperationAction.Send ? \"send\" : \"receive\";\n context.CoveredChannelActions.Add((channelId, actionString));\n@@ -169,3 +175,3 @@ private async Task ProcessSourceAsync(\n {\n- Action = action,\n+ Action = source.Action,\n Channel = new V3ReferenceDefinition { Reference = $\"#/channels/{channelId}\" },\n@@ -290,3 +296,3 @@ private static void EnsurePlaceholderMessage(Dictionary","commit-date":"2026-05-16T19:26:51Z","current-rev":"f5003d644","filename":"Brighter/src/Paramore.Brighter.AsyncAPI/AsyncApiHostExtensions.cs","previous-rev":"f38857a51","commit-title":"feat(#3828): hoist shared JSON Schema definitions to components.schemas","language":"C#","id":"a281e7924ca426d627f9bb709daa231724381400","model-score":0.92,"author-id":null,"project-id":32198,"delta-file-score":0.31179166,"diff":"diff --git a/src/Paramore.Brighter.AsyncAPI/AsyncApiHostExtensions.cs b/src/Paramore.Brighter.AsyncAPI/AsyncApiHostExtensions.cs\nindex 5bc24c0a6..6022aa42b 100644\n--- a/src/Paramore.Brighter.AsyncAPI/AsyncApiHostExtensions.cs\n+++ b/src/Paramore.Brighter.AsyncAPI/AsyncApiHostExtensions.cs\n@@ -191,4 +191,3 @@ private static string SerializeAsYaml(object? tree)\n JsonValueKind.Number => ReadNumber(element),\n- JsonValueKind.True => true,\n- JsonValueKind.False => false,\n+ JsonValueKind.True or JsonValueKind.False => element.GetBoolean(),\n _ => null,\n","improvement-type":"Complex Method"},{"architectural-component-id":null,"author-name":"gabisonia","training-data":{"loc-added":"7","loc-deleted":"10","delta-cc-mean":"0.0","delta-cc-total":"0","delta-penalties":"1.0","delta-n-functions":"0","current-file-score":"9.6882083290695"},"author-email":"irakli.gabisonia94@gmail.com","commit-full-message":"Expose optional sync and async requeue scheduler capabilities and use native scheduling on the consuming broker. Assign stable per-attempt delivery IDs to survive duplicate detection, and acknowledge only after scheduling succeeds.\n\nPreserve direct-subscription startup and abandon with a warning when delays cannot be honored. Cover failure recovery, broker ownership, forwarding isolation, sessions, and retry identity through regenerated conformance assertions.\n\nValidation: 26 focused cases pass on .NET 9 and 10; full ASB suite has 553 passed, 4 skipped, and the same 10 baseline emulator TTL failures. Azure scheduler tests: 13 passed. Generator tests: 312 passed. Release packages build for all supported targets.","commit-date":"2026-10-09T17:18:14Z","current-rev":"dba7b72f7","filename":"Brighter/src/Paramore.Brighter.MessagingGateway.AzureServiceBus/AzureServiceBusConsumerFactory.cs","previous-rev":"161b226f3","commit-title":"feat(asb): add native queue-targeted retry scheduling","language":"C#","id":"1024f351788320889cd72fe4675f0158c5d550f3","model-score":0.64,"author-id":null,"project-id":32198,"delta-file-score":0.59155285,"diff":"diff --git a/src/Paramore.Brighter.MessagingGateway.AzureServiceBus/AzureServiceBusConsumerFactory.cs b/src/Paramore.Brighter.MessagingGateway.AzureServiceBus/AzureServiceBusConsumerFactory.cs\nindex 8fc288e5c..daf001786 100644\n--- a/src/Paramore.Brighter.MessagingGateway.AzureServiceBus/AzureServiceBusConsumerFactory.cs\n+++ b/src/Paramore.Brighter.MessagingGateway.AzureServiceBus/AzureServiceBusConsumerFactory.cs\n@@ -38,2 +38,6 @@ public class AzureServiceBusConsumerFactory : IAmAMessageConsumerFactory\n \n+ /// The fallback scheduler for custom producers without native queue retry support.\n+ /// Built-in ASB queue producers schedule retries on their own broker and take precedence.\n+ public IAmAMessageScheduler? Scheduler { get; set; }\n+\n /// \n@@ -72,9 +76,2 @@ public IAmAMessageConsumerSync Create(Subscription subscription)\n \n- if (sub.RequeueDelay > TimeSpan.Zero && !sub.Configuration.UseServiceBusQueue\n- && sub.Configuration.ForwardTo is null)\n- {\n- throw new ConfigurationException(\n- \"Delayed topic retries require ForwardTo to a dedicated queue, or UseServiceBusQueue with externally provisioned forwarding.\");\n- }\n-\n var receiverProvider = new ServiceBusReceiverProvider(_clientProvider, sub.Configuration.MaxAutoLockRenewalDuration);\n@@ -99,3 +96,3 @@ public IAmAMessageConsumerSync Create(Subscription subscription)\n return new AzureServiceBusForwardingConsumer(sub, messageProducer,\n- nameSpaceManagerWrapper, receiverProvider);\n+ nameSpaceManagerWrapper, receiverProvider) { Scheduler = Scheduler };\n }\n@@ -113,3 +110,3 @@ public IAmAMessageConsumerSync Create(Subscription subscription)\n nameSpaceManagerWrapper,\n- receiverProvider);\n+ receiverProvider) { Scheduler = Scheduler };\n }\n@@ -126,3 +123,3 @@ public IAmAMessageConsumerSync Create(Subscription subscription)\n nameSpaceManagerWrapper,\n- receiverProvider);\n+ receiverProvider) { Scheduler = Scheduler };\n }\n","improvement-type":"Complex Method"},{"architectural-component-id":null,"author-name":"DevJonny","training-data":{"loc-added":"17","loc-deleted":"14","delta-cc-mean":"0.0","delta-cc-total":"0","delta-penalties":"1.08","delta-n-functions":"0","current-file-score":"10.0"},"author-email":"jonny.ollifflee@gmail.com","commit-full-message":"Extract LoadAssemblyTypes (handles ReflectionTypeLoadException) and\nTryGetPublicationTopic (per-type filter + topic resolution) from\nGetPublicationTopicTypes. Targets the last CodeScene advisory finding\n(Complex Method).\n\n46/46 AsyncAPI tests pass on net9.0 and net10.0.\n\nCo-Authored-By: Claude (claude-opus-4-7) ","commit-date":"2026-05-17T06:26:45Z","current-rev":"7f8b45280","filename":"Brighter/src/Paramore.Brighter.AsyncAPI/AsyncApiDocumentGenerator.cs","previous-rev":"6be065b71","commit-title":"refactor(#3828): split GetPublicationTopicTypes for clarity","language":"C#","id":"2287bc725ce16bc068f9b3178aae023ee15b02f8","model-score":0.5,"author-id":null,"project-id":32198,"delta-file-score":0.33626333,"diff":"diff --git a/src/Paramore.Brighter.AsyncAPI/AsyncApiDocumentGenerator.cs b/src/Paramore.Brighter.AsyncAPI/AsyncApiDocumentGenerator.cs\nindex 4a13108c1..6f8bd66a9 100644\n--- a/src/Paramore.Brighter.AsyncAPI/AsyncApiDocumentGenerator.cs\n+++ b/src/Paramore.Brighter.AsyncAPI/AsyncApiDocumentGenerator.cs\n@@ -248,6 +248,14 @@ private IEnumerable GetAssembliesToScan()\n {\n- Type[] types;\n+ foreach (var type in LoadAssemblyTypes(assembly))\n+ {\n+ var topic = TryGetPublicationTopic(type);\n+ if (topic != null) yield return (type, topic);\n+ }\n+ }\n+\n+ private static IEnumerable LoadAssemblyTypes(Assembly assembly)\n+ {\n try\n {\n- types = assembly.GetTypes();\n+ return assembly.GetTypes();\n }\n@@ -255,18 +263,13 @@ private IEnumerable GetAssembliesToScan()\n {\n- types = ex.Types.Where(t => t != null).ToArray()!;\n+ return ex.Types.Where(t => t != null).ToArray()!;\n }\n+ }\n \n- foreach (var type in types)\n- {\n- if (type.IsAbstract || type.IsInterface) continue;\n- if (!typeof(IRequest).IsAssignableFrom(type)) continue;\n-\n- var attr = type.GetCustomAttribute();\n- if (attr == null) continue;\n-\n- var topic = attr.Destination?.RoutingKey?.Value;\n- if (string.IsNullOrEmpty(topic)) continue;\n+ private static string? TryGetPublicationTopic(Type type)\n+ {\n+ if (type.IsAbstract || type.IsInterface) return null;\n+ if (!typeof(IRequest).IsAssignableFrom(type)) return null;\n \n- yield return (type, topic);\n- }\n+ var topic = type.GetCustomAttribute()?.Destination?.RoutingKey?.Value;\n+ return string.IsNullOrEmpty(topic) ? null : topic;\n }\n","improvement-type":"Complex Method"},{"architectural-component-id":null,"author-name":"Ian Cooper","training-data":{"loc-added":"39","loc-deleted":"20","delta-cc-mean":"0.0","delta-cc-total":"0","delta-penalties":"1.0","delta-n-functions":"0","current-file-score":"10.0"},"author-email":"ian_hammond_cooper@yahoo.co.uk","commit-full-message":"* chore: fix casing on ADR\n\n* fix: update the ADR for a better understanding of how we propogate context\n\n* chore: update the name of InMemoryMessageProducer.cs to better fit the pattern used elsewhere\n\n* chore: swap Assert.True to Assert.Contains for collections\n\n* feat: failing test checks that we have added trace context to headers of outgoing message\n\n* feat: add a class to support trace state explicity\n\n* feat: modify tests\n\n* chore: filename issue\n\n* chore: switch to assert contains\n\n* feat: ensure that we propogate trace context\n\n* fix: allow trace context to serialize for tests\n\n* fixing broken tests\n\n* feat: add async tests\n\n* feat: add sync version of propogation tests\n\n* chore: whitespace\n\n* feat: add RMQ support for traceparent and tracestate.\n\n* fix: baggage is not tracecontext, although format is similar; baggage is user-defined\n\n* fix: tests were using tracestate not baggage\n\n* fix: crate link spans as MS committed change; propogate tracecontext and baggage through pipeline\n\n* fix: adjust test to ensure baggage on parent activity\n\n* fix: rename test class\n\n* chore: add tracestring and baggage to test\n\n* fix RMQ propogates the context\n\n* chore: port between RMQ instances\n\n* fix: add trace propogation to RMQ\n\n* fix: add kafka context propogation\n\n* chore: Add some primitive types to avoid primitive obsession warnings from codescene\n\n* chore: missing XML comments on public methods\n\n* chore: lower primitive obsession for message and request id\n\n* chore: usages of content type for new header\n\n* fix: adjust for reply to as a routing key\n\n* fix: add serialization for new value objects\n\n* chore: adjust docs\n\n* fix: issues with serialization of new primitive types\n\n* fix: ContentType.cs value may be null in constructor\n\n* fix: increase test delay as fragile\n\n* Update src/Paramore.Brighter/Id.cs\n\nCo-authored-by: Rafael Lillo \n\n* fix: need to convert header types to primitives for bag\n\n* fix: make sync RMQ tests serial for reliability\n\n* fix: refactor LLM code\n\n* chore: move converters to own directory, add them for NewtonSoft for Kafka serdes\n\n* chore: remove spurious directory\n\n* fix: use a string base type for Id in a request, to make serializing it easily.\n\n* chore: unneeded namespace on attribute\n\n* feat: adding cloud events to Redis\n\n* fix: tests failing due to bad test string, does not use cloud events names\n\n* feat: add additional tests of persistence of message headers for new properties\n\n* fix: ASB tests need to check all properties\n\n* feat: use MS ContentType as used on public SDK and user defined type is awkward in that context (although MS type has limitations)\n\n* fix: body equality test not working\n\n* fix: errors with tests around cloud events transform; need to use strings, similar to params\n\n* fix: use charset with MS contenttype\n\n* feat: adding cloudevents support to ASB\n\n* feat: add cloud events and tracing to ASB\n\n* fix: correct tests for contenttype changes and cloudevents json specification\n\n* fix: correct for new content type\n\n---------\n\nCo-authored-by: Rafael Lillo ","commit-date":"2025-06-14T15:20:36Z","current-rev":"bc93b511c","filename":"Brighter/src/Paramore.Brighter.MessagingGateway.AWSSQS/SqsMessageSender.cs","previous-rev":"5767656ad","commit-title":"OTel Transports (#3605)","language":"C#","id":"4136886c0cbe98b6d426b5645ff6ddf0f5b82421","model-score":0.49,"author-id":null,"project-id":32198,"delta-file-score":0.4636132,"diff":"diff --git a/src/Paramore.Brighter.MessagingGateway.AWSSQS/SqsMessageSender.cs b/src/Paramore.Brighter.MessagingGateway.AWSSQS/SqsMessageSender.cs\nindex 65e3b1f20..18a8d7a88 100644\n--- a/src/Paramore.Brighter.MessagingGateway.AWSSQS/SqsMessageSender.cs\n+++ b/src/Paramore.Brighter.MessagingGateway.AWSSQS/SqsMessageSender.cs\n@@ -4,2 +4,3 @@\n using System.Net;\n+using System.Net.Mime;\n using System.Text.Json;\n@@ -10,3 +11,5 @@\n using Microsoft.Extensions.Logging;\n+using Newtonsoft.Json;\n using Paramore.Brighter.Extensions;\n+using Paramore.Brighter.JsonConverters;\n using Paramore.Brighter.Logging;\n@@ -48,2 +51,16 @@ public SqsMessageSender(string queueUrl, SqsType queueType, AmazonSQSClient clie\n public async Task SendAsync(Message message, TimeSpan? delay, CancellationToken cancellationToken)\n+ {\n+ var request = CreateSendMessageRequest(message, delay);\n+\n+ var response = await _client.SendMessageAsync(request, cancellationToken);\n+ if (response.HttpStatusCode is HttpStatusCode.OK or HttpStatusCode.Created\n+ or HttpStatusCode.Accepted)\n+ {\n+ return response.MessageId;\n+ }\n+\n+ return null;\n+ }\n+\n+ private SendMessageRequest CreateSendMessageRequest(Message message, TimeSpan? delay)\n {\n@@ -51,3 +68,3 @@ public SqsMessageSender(string queueUrl, SqsType queueType, AmazonSQSClient clie\n {\n- QueueUrl = _queueUrl, \n+ QueueUrl = _queueUrl,\n MessageBody = message.Body.Value\n@@ -55,2 +72,11 @@ public SqsMessageSender(string queueUrl, SqsType queueType, AmazonSQSClient clie\n \n+ SetMessageDelay(request, delay);\n+ SetFifoQueueProperties(request, message);\n+ SetMessageAttributes(request, message);\n+\n+ return request;\n+ }\n+\n+ private void SetMessageDelay(SendMessageRequest request, TimeSpan? delay)\n+ {\n delay ??= TimeSpan.Zero;\n@@ -58,3 +84,2 @@ public SqsMessageSender(string queueUrl, SqsType queueType, AmazonSQSClient clie\n {\n- // SQS has a hard limit of 15min for Delay in Seconds\n if (delay.Value > s_maxDelay)\n@@ -67,27 +92,30 @@ public SqsMessageSender(string queueUrl, SqsType queueType, AmazonSQSClient clie\n }\n+ }\n \n- if (_queueType == SqsType.Fifo)\n+ private void SetFifoQueueProperties(SendMessageRequest request, Message message)\n+ {\n+ if (_queueType != SqsType.Fifo) return;\n+ request.MessageGroupId = message.Header.PartitionKey;\n+ if (message.Header.Bag.TryGetValue(HeaderNames.DeduplicationId, out var deduplicationId))\n {\n- request.MessageGroupId = message.Header.PartitionKey;\n- if (message.Header.Bag.TryGetValue(HeaderNames.DeduplicationId, out var deduplicationId))\n- {\n- request.MessageDeduplicationId = (string)deduplicationId;\n- }\n+ request.MessageDeduplicationId = (string)deduplicationId;\n }\n- \n- // Combine cloud event headers into a single JSON object\n+ }\n+\n+ private void SetMessageAttributes(SendMessageRequest request, Message message)\n+ {\n string cloudEventHeadersJson = CreateCloudEventHeadersJson(message);\n \n- // we can set up to 10 attributes; we use a single JSON object as the cloud event headers; we can set nine others directly \n+ var contentType = message.Header.ContentType ?? new ContentType(MediaTypeNames.Text.Plain);\n var messageAttributes = new Dictionary\n- { \n- [HeaderNames.Id] = new (){ StringValue = message.Header.MessageId, DataType = \"String\" },\n+ {\n+ [HeaderNames.Id] = new() { StringValue = message.Header.MessageId, DataType = \"String\" },\n [HeaderNames.CloudEventHeaders] = new() { StringValue = cloudEventHeadersJson, DataType = \"String\" },\n- [HeaderNames.Topic] = new() { StringValue = _queueUrl ,DataType = \"String\" },\n+ [HeaderNames.Topic] = new() { StringValue = _queueUrl, DataType = \"String\" },\n [HeaderNames.MessageType] = new() { StringValue = message.Header.MessageType.ToString(), DataType = \"String\" },\n- [HeaderNames.ContentType] = new() { StringValue = message.Header.ContentType, DataType = \"String\" },\n+ [HeaderNames.ContentType] = new() { StringValue = contentType.ToString(), DataType = \"String\" },\n [HeaderNames.Timestamp] = new() { StringValue = Convert.ToString(message.Header.TimeStamp.ToRfc3339()), DataType = \"String\" }\n };\n- \n- if (!string.IsNullOrEmpty(message.Header.ReplyTo))\n+\n+ if (!RoutingKey.IsNullOrEmpty(message.Header.ReplyTo))\n messageAttributes.Add(HeaderNames.ReplyTo, new MessageAttributeValue { StringValue = message.Header.ReplyTo, DataType = \"String\" });\n@@ -97,20 +125,10 @@ public SqsMessageSender(string queueUrl, SqsType queueType, AmazonSQSClient clie\n \n- if (!string.IsNullOrEmpty(message.Header.CorrelationId))\n- messageAttributes.Add(HeaderNames.CorrelationId, new MessageAttributeValue { StringValue = message.Header.CorrelationId, DataType = \"String\" });\n- \n- //we have to add some attributes into our bag, to prevent overloading the message attributes\n+ if (!Id.IsNullOrEmpty(message.Header.CorrelationId))\n+ messageAttributes.Add(HeaderNames.CorrelationId, new MessageAttributeValue { StringValue = message.Header.CorrelationId, DataType = \"String\" });\n+\n message.Header.Bag[HeaderNames.HandledCount] = message.Header.HandledCount.ToString(CultureInfo.InvariantCulture);\n- \n- var bagJson = JsonSerializer.Serialize(message.Header.Bag, JsonSerialisationOptions.Options);\n+\n+ var bagJson = System.Text.Json.JsonSerializer.Serialize(message.Header.Bag, JsonSerialisationOptions.Options);\n messageAttributes[HeaderNames.Bag] = new() { StringValue = bagJson, DataType = \"String\" };\n request.MessageAttributes = messageAttributes;\n-\n- var response = await _client.SendMessageAsync(request, cancellationToken);\n- if (response.HttpStatusCode is HttpStatusCode.OK or HttpStatusCode.Created\n- or HttpStatusCode.Accepted)\n- {\n- return response.MessageId;\n- }\n-\n- return null;\n }\n@@ -119,2 +137,3 @@ private static string CreateCloudEventHeadersJson(Message message)\n {\n+ var contentType = message.Header.ContentType ?? new ContentType(MediaTypeNames.Text.Plain);\n var cloudEventHeaders = new Dictionary\n@@ -122,3 +141,3 @@ private static string CreateCloudEventHeadersJson(Message message)\n [HeaderNames.Id] = Convert.ToString(message.Header.MessageId),\n- [HeaderNames.DataContentType] = message.Header.ContentType ?? \"plain/text\",\n+ [HeaderNames.DataContentType] = contentType.ToString(),\n [HeaderNames.DataSchema] = message.Header.DataSchema?.ToString() ?? string.Empty,\n@@ -139,3 +158,3 @@ private static string CreateCloudEventHeadersJson(Message message)\n \n- var cloudEventHeadersJson = JsonSerializer.Serialize(cloudEventHeaders, JsonSerialisationOptions.Options);\n+ var cloudEventHeadersJson = System.Text.Json.JsonSerializer.Serialize(cloudEventHeaders, JsonSerialisationOptions.Options);\n return cloudEventHeadersJson;\n@@ -149,2 +168 @@ private static partial class Log\n }\n-\n","improvement-type":"Complex Method"},{"architectural-component-id":null,"author-name":"Ian Cooper","training-data":{"loc-added":"17","loc-deleted":"16","delta-cc-mean":"0.0","delta-cc-total":"0","delta-penalties":"1.0","delta-n-functions":"0","current-file-score":"8.816158827775617"},"author-email":"ian_hammond_cooper@yahoo.co.uk","commit-full-message":"Co-Authored-By: Claude Opus 5.5 \nClaude-Session: https://claude.ai/code/session_01HsKD52dnGHFLSEr93VZyR7","commit-date":"2026-10-12T13:23:04Z","current-rev":"90502e627","filename":"Brighter/src/Paramore.Brighter.BoxProvisioning.PostgreSql/PostgreSqlBoxDetectionHelper.cs","previous-rev":"7aca96a83","commit-title":"refactor: extract methods to express intent in BoxProvisioning.PostgreSql","language":"C#","id":"b7d978856416855c51d6c33293e8dacf04776f5b","model-score":0.3,"author-id":null,"project-id":32198,"delta-file-score":0.7845205,"diff":"diff --git a/src/Paramore.Brighter.BoxProvisioning.PostgreSql/PostgreSqlBoxDetectionHelper.cs b/src/Paramore.Brighter.BoxProvisioning.PostgreSql/PostgreSqlBoxDetectionHelper.cs\nindex 3b5bcf962..525808711 100644\n--- a/src/Paramore.Brighter.BoxProvisioning.PostgreSql/PostgreSqlBoxDetectionHelper.cs\n+++ b/src/Paramore.Brighter.BoxProvisioning.PostgreSql/PostgreSqlBoxDetectionHelper.cs\n@@ -115,19 +115,4 @@ public async Task DoesHistoryExistAsync(\n \n- // System-table existence: __BrighterMigrationHistory is created via quoted DDL\n- // (`CREATE TABLE IF NOT EXISTS .\"__BrighterMigrationHistory\"`), so its name\n- // is case-PRESERVED in pg_class. Routing through DoesTableExistAsync would lowercase\n- // the lookup to `'__brightermigrationhistory'` and miss. Inline the literal-name check,\n- // parameterising only the (folded) schema.\n- using (var existsCmd = connection.CreateCommand())\n- {\n- if (transaction != null) existsCmd.Transaction = transaction;\n- existsCmd.CommandText = @\"\n-SELECT EXISTS(SELECT 1 FROM INFORMATION_SCHEMA.TABLES\n-WHERE TABLE_SCHEMA = @HistorySchema AND TABLE_NAME = '__BrighterMigrationHistory')\";\n- existsCmd.Parameters.AddWithValue(\"@HistorySchema\", foldedHistorySchema);\n- var existsRaw = await existsCmd.ExecuteScalarAsync(cancellationToken);\n- var historyTableExists = existsRaw is bool b && b;\n- if (!historyTableExists)\n- return false;\n- }\n+ if (!await HistoryTableExistsAsync(connection, foldedHistorySchema, cancellationToken, transaction))\n+ return false;\n \n@@ -159,2 +144,18 @@ SELECT COUNT(1) FROM {quotedHistorySchema}.\"\"__BrighterMigrationHistory\"\"\n \n+ // The history table is created with a quoted name, so its case is preserved; this cannot use\n+ // DoesTableExistAsync, which folds the name to lowercase.\n+ private static async Task HistoryTableExistsAsync(\n+ NpgsqlConnection connection, string foldedHistorySchema,\n+ CancellationToken cancellationToken, NpgsqlTransaction? transaction)\n+ {\n+ using var command = connection.CreateCommand();\n+ if (transaction != null) command.Transaction = transaction;\n+ command.CommandText = @\"\n+SELECT EXISTS(SELECT 1 FROM INFORMATION_SCHEMA.TABLES\n+WHERE TABLE_SCHEMA = @HistorySchema AND TABLE_NAME = '__BrighterMigrationHistory')\";\n+ command.Parameters.AddWithValue(\"@HistorySchema\", foldedHistorySchema);\n+ var raw = await command.ExecuteScalarAsync(cancellationToken);\n+ return raw is bool exists && exists;\n+ }\n+\n /// \n","improvement-type":"Complex Method"},{"architectural-component-id":null,"author-name":"Steve Bush","training-data":{"loc-added":"46","loc-deleted":"63","delta-cc-mean":"0.0","delta-cc-total":"0","delta-penalties":"1.17","delta-n-functions":"0","current-file-score":"10.0"},"author-email":"stevebu@bushchang.com","commit-full-message":"* Refactoring of MQTT Support to use 4.3 MQTTnet\n\n* Removed MQTTnet v5 support for UserProperties. Removed Comments.\n\n* Fix logging of Exception when Test context is not available\n\n* Increase wait to 1 sec before testing for number of messages\n\n* SpinUntil instead of trying to time when requests will be processed\n\n* Update target platforms for test helpers to net8.0;net9.0\n\n* Adjust timeout to see if all messages are processed.\n\n* Reworking logging to reduce logging for routine message delivery\n\n* Fixed static Log class merge errors\n\n* Fix up passing of exception and port to new Log API.","commit-date":"2025-04-09T08:57:56Z","current-rev":"099708800","filename":"Brighter/src/Paramore.Brighter.MessagingGateway.MQTT/MQTTMessageConsumer.cs","previous-rev":"0741b9ef1","commit-title":"feature: refactoring of MQTT Support to use 4.3 MQTTnet (#3578)","language":"C#","id":"d27e8bc6b9d615c647eca3faefa2e0371bd11b02","model-score":0.3,"author-id":null,"project-id":32198,"delta-file-score":0.51462585,"diff":"diff --git a/src/Paramore.Brighter.MessagingGateway.MQTT/MQTTMessageConsumer.cs b/src/Paramore.Brighter.MessagingGateway.MQTT/MQTTMessageConsumer.cs\nindex 974658e30..dfeca6cff 100644\n--- a/src/Paramore.Brighter.MessagingGateway.MQTT/MQTTMessageConsumer.cs\n+++ b/src/Paramore.Brighter.MessagingGateway.MQTT/MQTTMessageConsumer.cs\n@@ -1,5 +1,3 @@\n using System;\n-using System.Buffers;\n using System.Collections.Generic;\n-using System.Text;\n using System.Text.Json;\n@@ -9,2 +7,3 @@\n using MQTTnet;\n+using MQTTnet.Client;\n using MQTTnet.Packets;\n@@ -16,12 +15,12 @@ namespace Paramore.Brighter.MessagingGateway.MQTT\n /// \n- /// Class MQTTMessageConsumer.\n- /// The is used on the server to receive messages from the broker. It abstracts away the details of \n+ /// Class MqttMessageConsumer.\n+ /// The is used on the server to receive messages from the broker. It abstracts away the details of \n /// inter-process communication tasks from the server. It handles subscription establishment, request reception and dispatching.\n /// \n- public partial class MQTTMessageConsumer : IAmAMessageConsumerSync, IAmAMessageConsumerAsync\n+ public partial class MqttMessageConsumer : IAmAMessageConsumerSync, IAmAMessageConsumerAsync\n {\n private readonly string _topic;\n- private readonly Queue _messageQueue = new Queue();\n- private static readonly ILogger s_logger = ApplicationLogging.CreateLogger();\n- private readonly Message _noopMessage = new Message();\n+ private readonly Queue _messageQueue = new();\n+ private static readonly ILogger s_logger = ApplicationLogging.CreateLogger();\n+ private readonly Message _noopMessage = new();\n private readonly IMqttClient _mqttClient;\n@@ -30,10 +29,22 @@ public partial class MQTTMessageConsumer : IAmAMessageConsumerSync, IAmAMessageC\n /// \n- /// Initializes a new instance of the class.\n- /// Sync over Async within constructor\n+ /// Initializes a new instance of the class.\n /// \n- /// \n- public MQTTMessageConsumer(MQTTMessagingGatewayConsumerConfiguration configuration)\n+ /// \n+ /// The configuration settings for the MQTT message consumer, including connection details, \n+ /// topic prefix, client credentials, and other options.\n+ /// \n+ /// \n+ /// Thrown when the is null.\n+ /// \n+ /// \n+ /// This constructor sets up the MQTT client with the provided configuration, establishes \n+ /// the connection to the broker, and subscribes to the specified topic.\n+ ///\n+ /// 04/03/2025:\n+ /// - Removed support for user properties as they are not supported in v3.1.1 of the MQTT protocol.\n+ /// \n+ public MqttMessageConsumer(MqttMessagingGatewayConsumerConfiguration configuration)\n {\n- _topic = $\"{configuration.TopicPrefix}/#\" ?? throw new ArgumentNullException(nameof(configuration.TopicPrefix));\n- \n+ _topic = $\"{configuration.TopicPrefix}/#\" ?? throw new ArgumentNullException(nameof(configuration.TopicPrefix));\n+\n MqttClientOptionsBuilder mqttClientOptionsBuilder = new MqttClientOptionsBuilder()\n@@ -52,7 +63,9 @@ public MQTTMessageConsumer(MQTTMessagingGatewayConsumerConfiguration configurati\n \n- _mqttClientOptions = mqttClientOptionsBuilder.Build();\n+ _mqttClientOptions = mqttClientOptionsBuilder\n+ .WithTcpServer(configuration.Hostname, configuration.Port)\n+ .Build();\n \n- //TODO: Switch to using the low level client here, as it allows us explicit control over ack, recieve etc.\n+ //TODO: Switch to using the low level client here, as it allows us explicit control over ack, receive etc.\n //This is slated for post V10, for now, we just want to upgrade this support the V10 release\n- _mqttClient = new MqttClientFactory().CreateMqttClient();\n+ _mqttClient = new MqttFactory().CreateMqttClient();\n \n@@ -61,36 +74,4 @@ public MQTTMessageConsumer(MQTTMessagingGatewayConsumerConfiguration configurati\n Log.MqttMessageConsumerReceivedMessage(s_logger, configuration.TopicPrefix);\n- var message = JsonSerializer.Deserialize(e.ApplicationMessage.Payload.ToArray(), JsonSerialisationOptions.Options);\n- foreach (MqttUserProperty property in e.ApplicationMessage.UserProperties)\n- {\n- if (property.Name == HeaderNames.Type)\n- {\n- message.Header.Type = property.Value;\n- }\n- else if (property.Name == HeaderNames.SpecVersion)\n- {\n- message.Header.SpecVersion = property.Value;\n- }\n- else if (property.Name == HeaderNames.Source)\n- {\n- if (Uri.TryCreate(property.Value, UriKind.RelativeOrAbsolute, out var source))\n- {\n- message.Header.Source = source;\n- }\n- }\n- else if (property.Name == HeaderNames.Subject)\n- {\n- message.Header.Subject = property.Value;\n- }\n- else if (property.Name == HeaderNames.DataContentType)\n- {\n- message.Header.ContentType = property.Value;\n- }\n- else if (property.Name == HeaderNames.DataSchema)\n- {\n- if (Uri.TryCreate(property.Value, UriKind.RelativeOrAbsolute, out var dataSchema))\n- {\n- message.Header.DataSchema = dataSchema;\n- }\n- }\n- }\n+ var message = JsonSerializer.Deserialize(e.ApplicationMessage.PayloadSegment.ToArray(), JsonSerialisationOptions.Options);\n+\n _messageQueue.Enqueue(message);\n@@ -112,3 +93,3 @@ public void Acknowledge(Message message)\n }\n- \n+\n /// \n@@ -117,3 +98,3 @@ public void Acknowledge(Message message)\n /// \n- public Task AcknowledgeAsync(Message message, CancellationToken cancellationToken = default(CancellationToken))\n+ public Task AcknowledgeAsync(Message message, CancellationToken cancellationToken = default)\n {\n@@ -127,8 +108,8 @@ public void Dispose()\n }\n- \n- \n+\n+\n public ValueTask DisposeAsync()\n {\n- _mqttClient.Dispose();\n- return new ValueTask(Task.CompletedTask);\n+ _mqttClient.Dispose();\n+ return new ValueTask(Task.CompletedTask);\n }\n@@ -142,3 +123,3 @@ public void Purge()\n }\n- \n+\n /// \n@@ -147,6 +128,6 @@ public void Purge()\n /// Allows cancellation of the purge task\n- public Task PurgeAsync(CancellationToken cancellationToken = default(CancellationToken))\n+ public Task PurgeAsync(CancellationToken cancellationToken = default)\n {\n- Purge();\n- return Task.CompletedTask;\n+ Purge();\n+ return Task.CompletedTask;\n }\n@@ -159,4 +140,6 @@ public Message[] Receive(TimeSpan? timeOut = null)\n {\n- if (_messageQueue.Count==0)\n+ if (_messageQueue.Count == 0)\n+ {\n return new[] { _noopMessage };\n+ }\n \n@@ -175,5 +158,5 @@ public Message[] Receive(TimeSpan? timeOut = null)\n }\n- catch (TimeoutException)\n+ catch (TimeoutException te)\n {\n- Log.MqttMessageConsumerTimedOutRetrievingMessages(s_logger, _messageQueue.Count);\n+ Log.MqttMessageConsumerTimedOutRetrievingMessages(s_logger, te, _messageQueue.Count);\n }\n@@ -184,4 +167,4 @@ public Message[] Receive(TimeSpan? timeOut = null)\n }\n- \n- public Task ReceiveAsync(TimeSpan? timeOut = null, CancellationToken cancellationToken = default(CancellationToken))\n+\n+ public Task ReceiveAsync(TimeSpan? timeOut = null, CancellationToken cancellationToken = default)\n {\n@@ -203,3 +186,3 @@ public void Reject(Message message)\n /// \n- public Task RejectAsync(Message message, CancellationToken cancellationToken = default(CancellationToken))\n+ public Task RejectAsync(Message message, CancellationToken cancellationToken = default)\n {\n@@ -218,5 +201,5 @@ public bool Requeue(Message message, TimeSpan? delay = null)\n }\n- \n+\n public Task RequeueAsync(Message message, TimeSpan? delay = null,\n- CancellationToken cancellationToken = default(CancellationToken))\n+ CancellationToken cancellationToken = default)\n {\n@@ -239,5 +222,5 @@ private async Task Connect(int connectionAttempts)\n }\n- catch (Exception)\n+ catch (Exception ex)\n {\n- Log.UnableToConnectMqttConsumerClient(s_logger);\n+ Log.UnableToConnectMqttConsumerClient(s_logger, ex);\n }\n@@ -248,7 +231,7 @@ private static partial class Log\n {\n- [LoggerMessage(LogLevel.Information, \"MQTTMessageConsumer: Received message from queue {TopicPrefix}\")]\n+ [LoggerMessage(LogLevel.Trace, \"MQTTMessageConsumer: Received message from queue {TopicPrefix}\")]\n public static partial void MqttMessageConsumerReceivedMessage(ILogger logger, object topicPrefix);\n \n- [LoggerMessage(LogLevel.Warning, \"MQTTMessageConsumer: Timed out retrieving messages. Queue length: {QueueLength}\")]\n- public static partial void MqttMessageConsumerTimedOutRetrievingMessages(ILogger logger, int queueLength);\n+ [LoggerMessage(Level = LogLevel.Warning, Message = \"MQTTMessageConsumer: Timed out retrieving messages. Queue length: {QueueLength}\")]\n+ public static partial void MqttMessageConsumerTimedOutRetrievingMessages(ILogger logger, Exception ex, int queueLength);\n \n@@ -259,5 +242,5 @@ private static partial class Log\n public static partial void SubscribedToTopic(ILogger logger, string topic);\n- \n- [LoggerMessage(LogLevel.Error, \"Unable to connect MQTT Consumer Client\")]\n- public static partial void UnableToConnectMqttConsumerClient(ILogger logger);\n+\n+ [LoggerMessage(Level = LogLevel.Error, Message = \"Unable to connect MQTT Consumer Client\")]\n+ public static partial void UnableToConnectMqttConsumerClient(ILogger logger, Exception ex);\n }\n","improvement-type":"Complex Method"},{"architectural-component-id":null,"author-name":"Tom Longhurst","training-data":{"loc-added":"74","loc-deleted":"33","delta-cc-mean":"0.0","delta-cc-total":"0","delta-penalties":"1.0","delta-n-functions":"0","current-file-score":"9.387218218812514"},"author-email":"30480171+thomhurst@users.noreply.github.com","commit-full-message":"* fix: serialise Dispatcher.Start so consumers are Open before Receive() returns (#4075)\n\nDispatcher.Start() flipped State to DS_RUNNING before opening consumers, so\nReceive()'s busy-wait could return while some consumers were still Shut. A\nShut()/End() racing into that window no-op'd against not-yet-Open consumers\n(Consumer.Shut only acts when State == Open). The control task then opened\nthose consumers, leaving orphan performers parked in Task.Delay forever and\nhanging End() in Task.WaitAny.\n\nOpen every consumer and register its task before publishing DS_RUNNING, and\nreplace the 100ms poll with a TaskCompletionSource that gives callers an\nexplicit happens-before edge over the opens. Add a lock + pending-shut flag\non Consumer so a Shut() arriving before Open() is honoured (defence in depth\nfor any future caller path that opens off the control task).\n\n* chore: trim verbose comments on #4075 fix\n\n* refactor: flatten Dispatcher.Start nesting (CodeScene Bumpy Road)\n\nExtract control-loop body into RunControlLoop, then split into\nTryOpenConsumers, WaitForPerformersToStop, HandleNextStoppedPerformer,\nand RemoveConsumerForTask. Each helper has at most one level of\nconditional nesting, killing the \"Bumpy Road Ahead\" flag on\nPR #4081 without changing behavior.\n\n* refactor: simplify TryOpenConsumers and drop redundant OfType\n\n- Collapse TryOpenConsumers (bool, dead false-branch) into void\n OpenConsumers; move TCS signalling and try/catch up into\n RunControlLoop where they belong.\n- Iterate Consumers directly instead of OfType(); the\n IAmAConsumer interface already exposes Open/Job/JobId.\n\n---------\n\nCo-authored-by: Ian Cooper ","commit-date":"2026-04-26T17:18:29Z","current-rev":"f94246cd8","filename":"Brighter/src/Paramore.Brighter.ServiceActivator/Dispatcher.cs","previous-rev":"3a0528638","commit-title":"fix: Dispatcher shutdown race leaves late-opened Reactor consumers running (#4075) (#4081)","language":"C#","id":"b453d2853c4228105b707fea96483f93cd8ee3c1","model-score":0.1,"author-id":null,"project-id":32198,"delta-file-score":0.84183866,"diff":"diff --git a/src/Paramore.Brighter.ServiceActivator/Dispatcher.cs b/src/Paramore.Brighter.ServiceActivator/Dispatcher.cs\nindex 8abdbe43d..a9ca4b575 100644\n--- a/src/Paramore.Brighter.ServiceActivator/Dispatcher.cs\n+++ b/src/Paramore.Brighter.ServiceActivator/Dispatcher.cs\n@@ -284,63 +284,104 @@ private void Start()\n {\n- _controlTask = Task.Factory.StartNew(() =>\n+ // Block Start() callers until every consumer is Open. A Shut()/End() racing in\n+ // immediately after Receive() returns must not see a still-Shut consumer, or the\n+ // late-opened performer leaks and End() hangs forever in Task.WaitAny.\n+ var startup = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously);\n+\n+ _controlTask = Task.Factory.StartNew(\n+ () => RunControlLoop(startup),\n+ CancellationToken.None,\n+ TaskCreationOptions.LongRunning,\n+ TaskScheduler.Default);\n+\n+ startup.Task.GetAwaiter().GetResult();\n+ }\n+\n+ private void RunControlLoop(TaskCompletionSource startup)\n+ {\n+ if (State != DispatcherState.DS_AWAITING && State != DispatcherState.DS_STOPPED)\n {\n- if (State == DispatcherState.DS_AWAITING || State == DispatcherState.DS_STOPPED)\n- {\n- Log.DispatcherStarting(s_logger);\n- State = DispatcherState.DS_RUNNING;\n+ startup.TrySetResult(true);\n+ return;\n+ }\n+\n+ Log.DispatcherStarting(s_logger);\n+\n+ try\n+ {\n+ OpenConsumers();\n+ State = DispatcherState.DS_RUNNING;\n+ startup.TrySetResult(true);\n+ }\n+ catch (Exception ex)\n+ {\n+ Log.ErrorOnConsumer(s_logger, ex);\n+ startup.TrySetException(ex);\n+ throw;\n+ }\n+\n+ Log.DispatcherStartingPerformers(s_logger, _tasks.Count);\n \n- var consumers = Consumers.ToArray();\n- consumers.Each(consumer => consumer.Open());\n- consumers.Each(consumer => _tasks.TryAdd(consumer.JobId, consumer.Job!));\n+ WaitForPerformersToStop();\n+\n+ State = DispatcherState.DS_STOPPED;\n+ Log.DispatcherStopped(s_logger);\n+ }\n \n- Log.DispatcherStartingPerformers(s_logger, _tasks.Count);\n+ private void OpenConsumers()\n+ {\n+ foreach (var consumer in Consumers)\n+ {\n+ consumer.Open();\n+ if (consumer.Job is not null)\n+ _tasks.TryAdd(consumer.JobId, consumer.Job);\n+ }\n+ }\n \n- while (_tasks.Any())\n+ private void WaitForPerformersToStop()\n+ {\n+ while (!_tasks.IsEmpty)\n+ {\n+ try\n+ {\n+ HandleNextStoppedPerformer();\n+ }\n+ catch (AggregateException ae)\n+ {\n+ ae.Handle(ex =>\n {\n- try\n- {\n- var runningTasks = _tasks.Values.ToArray();\n- var index = Task.WaitAny(runningTasks);\n- var stoppingConsumer = runningTasks[index];\n- Log.PerformerStopped(s_logger, stoppingConsumer.Status);\n-\n- var consumer = Consumers.SingleOrDefault(c => c.JobId == stoppingConsumer.Id);\n- if (consumer != null)\n- {\n- Log.RemovingConsumer(s_logger, consumer.Name);\n-\n- if (_consumers.TryRemove(consumer.Name, out consumer))\n- {\n- consumer.Dispose();\n- }\n- }\n-\n- if (_tasks.TryRemove(stoppingConsumer.Id, out var removedTask))\n- {\n- removedTask?.Dispose();\n- }\n-\n- stoppingConsumer.Dispose();\n- }\n- catch (AggregateException ae)\n- {\n- ae.Handle(ex =>\n- {\n- Log.ErrorOnConsumer(s_logger, ex);\n- return true;\n- });\n- }\n- }\n-\n- State = DispatcherState.DS_STOPPED;\n- Log.DispatcherStopped(s_logger);\n+ Log.ErrorOnConsumer(s_logger, ex);\n+ return true;\n+ });\n }\n- },\n- CancellationToken.None,\n- TaskCreationOptions.LongRunning,\n- TaskScheduler.Default);\n+ }\n+ }\n+\n+ private void HandleNextStoppedPerformer()\n+ {\n+ var runningTasks = _tasks.Values.ToArray();\n+ var index = Task.WaitAny(runningTasks);\n+ var stoppingConsumer = runningTasks[index];\n+ Log.PerformerStopped(s_logger, stoppingConsumer.Status);\n+\n+ RemoveConsumerForTask(stoppingConsumer);\n+\n+ if (_tasks.TryRemove(stoppingConsumer.Id, out var removedTask))\n+ {\n+ removedTask?.Dispose();\n+ }\n+\n+ stoppingConsumer.Dispose();\n+ }\n+\n+ private void RemoveConsumerForTask(Task stoppingConsumer)\n+ {\n+ var consumer = Consumers.SingleOrDefault(c => c.JobId == stoppingConsumer.Id);\n+ if (consumer is null)\n+ return;\n+\n+ Log.RemovingConsumer(s_logger, consumer.Name);\n \n- while (State != DispatcherState.DS_RUNNING)\n+ if (_consumers.TryRemove(consumer.Name, out consumer))\n {\n- Thread.Sleep(100); //Block main Dispatcher thread whilst control plane starts\n+ consumer.Dispose();\n }\n","improvement-type":"Complex Method"},{"architectural-component-id":null,"author-name":"Ian Cooper","training-data":{"loc-added":"30","loc-deleted":"42","delta-cc-mean":"0.0","delta-cc-total":"0","delta-penalties":"1.0","delta-n-functions":"0","current-file-score":"8.816158827775617"},"author-email":"ian_hammond_cooper@yahoo.co.uk","commit-full-message":"Co-Authored-By: Claude Opus 5.5 \nClaude-Session: https://claude.ai/code/session_01HsKD52dnGHFLSEr93VZyR7","commit-date":"2026-10-12T13:23:04Z","current-rev":"90502e627","filename":"Brighter/src/Paramore.Brighter.BoxProvisioning.PostgreSql/PostgreSqlBoxMigrationRunner.cs","previous-rev":"7aca96a83","commit-title":"refactor: extract methods to express intent in BoxProvisioning.PostgreSql","language":"C#","id":"0d77d6fdfc8105fa700f57319eb18dbc943942d9","model-score":0.1,"author-id":null,"project-id":32198,"delta-file-score":0.27077925,"diff":"diff --git a/src/Paramore.Brighter.BoxProvisioning.PostgreSql/PostgreSqlBoxMigrationRunner.cs b/src/Paramore.Brighter.BoxProvisioning.PostgreSql/PostgreSqlBoxMigrationRunner.cs\nindex 6a49eb25c..0634c4503 100644\n--- a/src/Paramore.Brighter.BoxProvisioning.PostgreSql/PostgreSqlBoxMigrationRunner.cs\n+++ b/src/Paramore.Brighter.BoxProvisioning.PostgreSql/PostgreSqlBoxMigrationRunner.cs\n@@ -118,14 +118,14 @@ protected override string LockResourceFor(string? schemaName, string tableName)\n \n- // Quoted, and so folded, the same way the detection helper reads it.\n- private string QuotedHistorySchema()\n+ // Never null here: DefaultHistorySchema is \"public\", and the base rejects PerSchema without a\n+ // SchemaName before migrating.\n+ private string ValidatedHistorySchema()\n {\n- // The `!` is safe: DefaultHistorySchema returns the non-null \"public\" const on this runner\n- // and the D3 guard rejects PerSchema with a null SchemaName before MigrateAsync proceeds,\n- // so ResolveHistorySchema() is provably non-null here. If a future refactor breaks that\n- // invariant, NRE points at this line.\n- var schema = ResolveHistorySchema()!;\n- Identifiers.AssertSafe(schema, nameof(schema));\n- return PgIdentifier.Quote(schema);\n+ var resolvedHistorySchema = ResolveHistorySchema()!;\n+ Identifiers.AssertSafe(resolvedHistorySchema, nameof(resolvedHistorySchema));\n+ return resolvedHistorySchema;\n }\n \n+ // Quoted, and so folded, the same way the detection helper reads it.\n+ private string QuotedHistorySchema() => PgIdentifier.Quote(ValidatedHistorySchema());\n+\n protected override async Task EnsureHistoryTableAsync(\n@@ -134,11 +134,3 @@ protected override async Task EnsureHistoryTableAsync(\n {\n- // Resolve the physical history schema once. Under PerSchema it's the configured (non-null)\n- // SchemaName; under Global it is the backend default (\"public\"). The detection helper folds\n- // the same value the same way (PgIdentifier.Quote / Normalize), so write and read never\n- // diverge. AssertSafe guards against any unsafe schema literal leaking into the inline DDL.\n- // The `!` is safe: DefaultHistorySchema returns the non-null \"public\" const on this runner\n- // and the D3 guard rejects PerSchema with a null SchemaName before MigrateAsync proceeds,\n- // so ResolveHistorySchema() is provably non-null here.\n- var resolvedHistorySchema = ResolveHistorySchema()!;\n- Identifiers.AssertSafe(resolvedHistorySchema, nameof(resolvedHistorySchema));\n+ var resolvedHistorySchema = ValidatedHistorySchema();\n var historySchemaQuoted = PgIdentifier.Quote(resolvedHistorySchema);\n@@ -146,14 +138,24 @@ protected override async Task EnsureHistoryTableAsync(\n \n- // D5 (ADR 0060): on a PerSchema run that follows a Global predecessor, copy this tenant's\n- // prior history rows from the legacy public.__BrighterMigrationHistory so the runner does\n- // NOT mis-detect the box as needing a bootstrap re-stamp (which would silently re-run\n- // migration accounting and break FR5). Skipped when the folded resolved history schema\n- // equals the folded backend default (Global, or PerSchema with SchemaName == \"public\") —\n- // then per-schema and legacy are the same table and there is nothing to copy.\n- var needsSeedCheck = !string.Equals(historySchemaFolded, HISTORY_TABLE_SCHEMA, StringComparison.Ordinal);\n+ var historyIsSeparateFromLegacy = !string.Equals(historySchemaFolded, HISTORY_TABLE_SCHEMA, StringComparison.Ordinal);\n \n- using (var command = connection.CreateCommand())\n+ await CreateHistoryTableAsync(connection, transaction, historySchemaQuoted, cancellationToken);\n+\n+ if (historyIsSeparateFromLegacy)\n {\n- command.Transaction = transaction;\n- command.CommandText = $@\"\n+ await SeedHistoryFromLegacyAsync(\n+ connection, transaction, historySchemaQuoted, resolvedHistorySchema,\n+ schemaName ?? resolvedHistorySchema, tableName, cancellationToken);\n+ }\n+ }\n+\n+ // A provisioner for another box can race this CREATE (ADR 0057 §3). Postgres aborts the whole\n+ // transaction on the loser's duplicate error even when it is caught, so the CREATE runs inside\n+ // a savepoint that the catch rolls back to.\n+ private async Task CreateHistoryTableAsync(\n+ NpgsqlConnection connection, NpgsqlTransaction? transaction, string historySchemaQuoted,\n+ CancellationToken cancellationToken)\n+ {\n+ using var command = connection.CreateCommand();\n+ command.Transaction = transaction;\n+ command.CommandText = $@\"\n CREATE TABLE IF NOT EXISTS {historySchemaQuoted}.\"\"{MIGRATION_HISTORY_TABLE}\"\" (\n@@ -166,43 +168,29 @@ PRIMARY KEY (\"\"SchemaName\"\", \"\"BoxTableName\"\", \"\"MigrationVersion\"\")\n )\";\n- // Postgres marks the outer transaction as aborted on a catalog-level duplicate-type\n- // error from CREATE TABLE IF NOT EXISTS regardless of whether we catch it. Without a\n- // savepoint the catch below leaves the transaction \"poisoned\" — RedetectStateAsync's\n- // next statement then fails with 25P02 even though our swallow was intentional. A\n- // SAVEPOINT around the CREATE narrows the abort to the inner sub-transaction, so\n- // ROLLBACK TO SAVEPOINT restores a usable transaction state on the racing path.\n+ if (transaction is not null)\n+ {\n+ await transaction.SaveAsync(HistoryTableSavepoint, cancellationToken);\n+ }\n+ try\n+ {\n+ await command.ExecuteNonQueryAsync(cancellationToken);\n if (transaction is not null)\n {\n- await transaction.SaveAsync(HistoryTableSavepoint, cancellationToken);\n- }\n- try\n- {\n- await command.ExecuteNonQueryAsync(cancellationToken);\n- if (transaction is not null)\n- {\n- await transaction.ReleaseAsync(HistoryTableSavepoint, cancellationToken);\n- }\n+ await transaction.ReleaseAsync(HistoryTableSavepoint, cancellationToken);\n }\n- catch (PostgresException ex) when (\n- ex.SqlState == PostgresErrorCodes.UniqueViolation\n- || ex.SqlState == PostgresErrorCodes.DuplicateTable\n- || ex.SqlState == PostgresErrorCodes.DuplicateObject)\n+ }\n+ catch (PostgresException ex) when (\n+ ex.SqlState == PostgresErrorCodes.UniqueViolation\n+ || ex.SqlState == PostgresErrorCodes.DuplicateTable\n+ || ex.SqlState == PostgresErrorCodes.DuplicateObject)\n+ {\n+ if (transaction is not null)\n {\n- if (transaction is not null)\n- {\n- await transaction.RollbackAsync(HistoryTableSavepoint, cancellationToken);\n- }\n-\n- Logger.LogDebug(ex,\n- \"{HistoryTable} already created by racing session (Postgres SqlState {SqlState})\",\n- MIGRATION_HISTORY_TABLE, ex.SqlState);\n- Activity.Current?.AddEvent(new ActivityEvent(\n- BrighterSemanticConventions.BoxMigrationEventHistoryTableRaceSwallowed));\n+ await transaction.RollbackAsync(HistoryTableSavepoint, cancellationToken);\n }\n- }\n \n- if (needsSeedCheck)\n- {\n- await SeedHistoryFromLegacyAsync(\n- connection, transaction, historySchemaQuoted, resolvedHistorySchema,\n- schemaName ?? resolvedHistorySchema, tableName, cancellationToken);\n+ Logger.LogDebug(ex,\n+ \"{HistoryTable} already created by racing session (Postgres SqlState {SqlState})\",\n+ MIGRATION_HISTORY_TABLE, ex.SqlState);\n+ Activity.Current?.AddEvent(new ActivityEvent(\n+ BrighterSemanticConventions.BoxMigrationEventHistoryTableRaceSwallowed));\n }\n@@ -301,3 +289,3 @@ SELECT 1 FROM {perSchemaQuoted}.\"\"{MIGRATION_HISTORY_TABLE}\"\" AS tgt\n private static bool IsLegacyHistoryReadPermissionDenied(PostgresException ex) =>\n- ex.SqlState == \"42501\";\n+ ex.SqlState == PostgresErrorCodes.InsufficientPrivilege;\n \n","improvement-type":"Complex Method"},{"architectural-component-id":null,"author-name":"Ian Cooper","training-data":{"loc-added":"69","loc-deleted":"78","delta-cc-mean":"0.0","delta-cc-total":"0","delta-penalties":"1.944","delta-n-functions":"0","current-file-score":"8.715400157423334"},"author-email":"ian_hammond_cooper@yahoo.co.uk","commit-full-message":"Replace explanatory comments in SqlBoxMigrationRunner.MigrateAsync,\nSqlBoxProvisioner.ProvisionAsync and UseBoxProvisioning with private\nmethods whose names carry the intent (GuardIdentifiers, GetMigrations,\nRollbackWithoutMaskingAsync, ReleaseAsync, ReadHistoryExistsHintAsync,\nRegisterProvisionersThenMarker, ...), keeping a short comment above a\nsignature only where the name cannot carry a trap.\n\nCo-Authored-By: Claude Opus 5.5 \nClaude-Session: https://claude.ai/code/session_01HsKD52dnGHFLSEr93VZyR7","commit-date":"2026-10-11T18:52:01Z","current-rev":"5253c5133","filename":"Brighter/src/Paramore.Brighter.BoxProvisioning/SqlBoxMigrationRunner.cs","previous-rev":"0dcac0a6e","commit-title":"refactor: extract methods to express intent in BoxProvisioning","language":"C#","id":"7f99866c7425afba46bf58093b14e41f01bacae6","model-score":0.02,"author-id":null,"project-id":32198,"delta-file-score":0.15510798,"diff":"diff --git a/src/Paramore.Brighter.BoxProvisioning/SqlBoxMigrationRunner.cs b/src/Paramore.Brighter.BoxProvisioning/SqlBoxMigrationRunner.cs\nindex 33df98923..491109e0e 100644\n--- a/src/Paramore.Brighter.BoxProvisioning/SqlBoxMigrationRunner.cs\n+++ b/src/Paramore.Brighter.BoxProvisioning/SqlBoxMigrationRunner.cs\n@@ -182,49 +182,6 @@ public async Task MigrateAsync(\n {\n- // Defence-in-depth at the framework chokepoint. Catalogs gate AssertSafe at the entry to\n- // All(...), but the runner is independently reachable (callers can construct a migration\n- // list and invoke MigrateAsync directly), so the public entry point must validate too.\n- Identifiers.AssertSafe(tableName.Value, nameof(tableName));\n-\n- // schemaName is optional: SQLite has no schema concept per ADR 0057 §6, so an absent value\n- // is legitimate and must not be rejected as \"missing\". A SchemaName is \"absent\" when it is\n- // a null reference OR wraps a null/empty string — callers commonly reach the latter via the\n- // implicit string->SchemaName conversion of a null/empty value (e.g. an unconfigured\n- // RelationalDatabaseConfiguration.SchemaName). Collapse every absent form to a single null\n- // using SchemaName.IsNullOrEmpty (the canonical \"absent\" check, mirroring Id.IsNullOrEmpty)\n- // so the AssertSafe gate and every downstream `schemaName?.Value ?? ` treat\n- // them identically — preserving the semantics of the `string?` parameter this value type\n- // replaced (spec 0030), which a bare `is not null` reference check silently broke.\n- if (SchemaName.IsNullOrEmpty(schemaName))\n- {\n- schemaName = null;\n- }\n- else\n- {\n- Identifiers.AssertSafe(schemaName.Value, nameof(schemaName));\n- }\n-\n- // D3 misconfiguration guard (FR1a/AC1a): on a placement backend, PerSchema needs a schema\n- // to place history in. A null SchemaName is an operator misconfiguration — reject it at the\n- // entry point rather than silently falling back to Global. Backends that do not support\n- // PerSchema (MySQL/SQLite) never trip this; for them PerSchema is a no-op.\n- if (Scope == MigrationHistoryScope.PerSchema && SupportsPerSchemaHistory && Configuration.SchemaName is null)\n- {\n- throw new ConfigurationException(\n- \"MigrationHistoryScope.PerSchema requires a non-null SchemaName; there is no schema to place history in.\");\n- }\n-\n- // The runner sources its migration chain and fresh-install DDL\n- // from the injected catalog rather than via parameter. A catalog returning null for\n- // either would surface inside ValidateMigrationsMonotonic / ExecuteFreshInstallAsync as\n- // an opaque NRE; replace with a descriptive operator-facing diagnostic. Empty migration\n- // lists are intentionally permitted: relational catalogs always return ≥V1, and\n- // internal tests use Array.Empty() as a \"don't care\" payload when\n- // exercising hook-ordering, re-detection, or failure-path contracts.\n- var migrations = _catalog.All(_configuration);\n- if (migrations is null)\n- {\n- throw new ConfigurationException(\n- $\"Migration list for '{(schemaName is null ? tableName : $\"{schemaName}.{tableName}\")}' was null. The injected IAmABoxMigrationCatalog must return a non-null list from All(...).\");\n- }\n+ schemaName = GuardIdentifiers(tableName, schemaName);\n+ ThrowIfPerSchemaHasNoSchema();\n \n+ var migrations = GetMigrations(tableName, schemaName);\n ValidateMigrationsMonotonic(schemaName?.Value, tableName.Value, migrations);\n@@ -233,16 +190,4 @@ public async Task MigrateAsync(\n \n- // Spec 0029 NF5/AC7 (ADR 0060 D6): surface the placement decision per run so an operator\n- // can answer \"where did THIS tenant's migration history go?\" without correlating to the\n- // provisioner config. The single Information log carries the table, the resolved physical\n- // history schema (or the placeholder \"\" on backends with no distinct\n- // history schema concept, e.g. SQLite / MySQL), and the active MigrationHistoryScope.\n- // Fires once per run regardless of which path (fresh / bootstrap / normal) dispatches.\n- Logger.LogInformation(\n- \"Box migration history for {BoxTable} resolved to schema {HistorySchema} (scope {Scope})\",\n- tableName, ResolveHistorySchema() ?? \"\", _scope);\n+ LogHistoryPlacement(tableName);\n \n- // Sync Dispose for the connection: DbConnection does not implement IAsyncDisposable\n- // on netstandard2.0, so DisposeAsync is unavailable across the shared-assembly TFM\n- // matrix. The UoW implements IAsyncDisposable (see IAmAProvisioningUnitOfWork) and\n- // is awaited explicitly in the finally.\n TConnection? connection = null;\n@@ -305,22 +250,3 @@ await RunNormalPathAsync(\n activity?.AddException(ex);\n- // Pass CancellationToken.None: a signalled caller token must not abandon the unwind.\n- // See ADR 0058 §B.3 cancellation contract.\n- try\n- {\n- await uow.RollbackAsync(CancellationToken.None);\n- }\n- catch (Exception rollbackEx)\n- {\n- // Defense in depth: the IAmAProvisioningUnitOfWork contract says RollbackAsync\n- // MUST NOT throw, and the four per-backend impls comply (PG and MySQL tightened\n- // explicitly in 3c8417fd6). If a future regression breaks that, do NOT let the\n- // rollback exception mask the original triggering exception — the primary cause\n- // is more diagnostically valuable than a defect in our own unwind, and callers\n- // pattern-match on the type they actually threw. Log the rollback failure at\n- // Error level so operators see both: the primary failure surfaces via rethrow,\n- // the rollback defect surfaces via the log.\n- Logger.LogError(rollbackEx,\n- \"Box migration unit-of-work RollbackAsync threw while unwinding from a primary failure for table '{Table}'; rollback exception is logged, primary exception is rethrown.\",\n- tableName);\n- }\n+ await RollbackWithoutMaskingAsync(uow, tableName);\n throw;\n@@ -330,13 +256,78 @@ await RunNormalPathAsync(\n {\n- // Disposal order mirrors the previous `await using var uow` / `using var connection`\n- // pair: UoW first (releases any per-backend advisory lock + transaction state),\n- // then the connection. Null checks defend the bootstrap-failure-before-assignment\n- // case: if OpenConnectionAsync threw, both locals stay null; if BeginAsync threw,\n- // both are assigned and need disposal.\n- if (uow is not null)\n- {\n- await uow.DisposeAsync();\n- }\n- connection?.Dispose();\n+ await ReleaseAsync(uow, connection);\n+ }\n+ }\n+\n+ // The runner is callable without going through a catalog, so it asserts identifier safety\n+ // itself. A SchemaName that wraps a null or empty string is absent, the same as a null one.\n+ private static SchemaName? GuardIdentifiers(BoxTableName tableName, SchemaName? schemaName)\n+ {\n+ Identifiers.AssertSafe(tableName.Value, nameof(tableName));\n+\n+ if (SchemaName.IsNullOrEmpty(schemaName))\n+ {\n+ return null;\n+ }\n+\n+ Identifiers.AssertSafe(schemaName.Value, nameof(schemaName));\n+ return schemaName;\n+ }\n+\n+ private void ThrowIfPerSchemaHasNoSchema()\n+ {\n+ if (Scope == MigrationHistoryScope.PerSchema && SupportsPerSchemaHistory && Configuration.SchemaName is null)\n+ {\n+ throw new ConfigurationException(\n+ \"MigrationHistoryScope.PerSchema requires a non-null SchemaName; there is no schema to place history in.\");\n+ }\n+ }\n+\n+ // An empty chain is allowed; a null one is a catalog defect, reported here rather than as an\n+ // NRE further in.\n+ private IReadOnlyList GetMigrations(BoxTableName tableName, SchemaName? schemaName)\n+ {\n+ var migrations = _catalog.All(_configuration);\n+ if (migrations is null)\n+ {\n+ throw new ConfigurationException(\n+ $\"Migration list for '{(schemaName is null ? tableName : $\"{schemaName}.{tableName}\")}' was null. The injected IAmABoxMigrationCatalog must return a non-null list from All(...).\");\n+ }\n+\n+ return migrations;\n+ }\n+\n+ // Lets an operator see where this run's migration history lives without reading the\n+ // provisioner configuration (ADR 0060).\n+ private void LogHistoryPlacement(BoxTableName tableName) =>\n+ Logger.LogInformation(\n+ \"Box migration history for {BoxTable} resolved to schema {HistorySchema} (scope {Scope})\",\n+ tableName, ResolveHistorySchema() ?? \"\", _scope);\n+\n+ // Rolls back with CancellationToken.None so a cancelled caller cannot abandon the unwind\n+ // (ADR 0058 §B.3). RollbackAsync must not throw; if it does, the failure is logged rather\n+ // than allowed to mask the primary exception the caller is about to see.\n+ private async Task RollbackWithoutMaskingAsync(IAmAProvisioningUnitOfWork uow, BoxTableName tableName)\n+ {\n+ try\n+ {\n+ await uow.RollbackAsync(CancellationToken.None);\n+ }\n+ catch (Exception rollbackEx)\n+ {\n+ Logger.LogError(rollbackEx,\n+ \"Box migration unit-of-work RollbackAsync threw while unwinding from a primary failure for table '{Table}'; rollback exception is logged, primary exception is rethrown.\",\n+ tableName);\n+ }\n+ }\n+\n+ // Releases the unit of work (lock and transaction) before the connection. Either may be null\n+ // if setup failed part way. The connection is disposed synchronously because DbConnection has\n+ // no DisposeAsync on netstandard2.0.\n+ private static async Task ReleaseAsync(IAmAProvisioningUnitOfWork? uow, TConnection? connection)\n+ {\n+ if (uow is not null)\n+ {\n+ await uow.DisposeAsync();\n }\n+ connection?.Dispose();\n }\n","improvement-type":"Complex Method"}],"change-level":"warning","is-hotspot?":false,"line":352,"what-changed":"AccessibilityModifier has a cyclomatic complexity of 9, threshold = 9","how-to-fix":"There are many reasons for Complex Method. Sometimes, another design approach is beneficial such as a) modeling state using an explicit state machine rather than conditionals, or b) using table lookup rather than long chains of logic. In other scenarios, the function can be split using [EXTRACT FUNCTION](https://refactoring.com/catalog/extractFunction.html). Just make sure you extract natural and cohesive functions. Complex Methods can also be addressed by identifying complex conditional expressions and then using the [DECOMPOSE CONDITIONAL](https://refactoring.com/catalog/decomposeConditional.html) refactoring.","change-type":"introduced"},{"method":"IsClassifiable","why-it-occurs":"A complex conditional is an expression inside a branch such as an if-statmeent which consists of multiple, logical operations. Example: if (x.started() && y.running()).Complex conditionals make the code even harder to read, and contribute to the Complex Method code smell. Encapsulate them.","name":"Complex Conditional","file":"src/Paramore.Brighter.SourceGenerators/SemanticModelReader.cs","refactoring-examples":[{"diff":"diff --git a/complex_conditional.js b/complex_conditional.js\nindex c43da09584..94259ce874 100644\n--- a/complex_conditional.js\n+++ b/complex_conditional.js\n@@ -1,16 +1,34 @@\n function messageReceived(message, timeReceived) {\n- // Ignore all messages which aren't from known customers:\n- if (!message.sender &&\n- customers.getId(message.name) == null) {\n+ // Refactoring #1: encapsulate the business rule in a\n+ // function. A clear name replaces the need for the comment:\n+ if (!knownCustomer(message)) {\n log('spam received -- ignoring');\n return;\n }\n \n- // Provide an auto-reply when outside business hours:\n- if ((timeReceived.getHours() > 17) ||\n- (timeReceived.getHours() < 8)) {\n+ // Refactoring #2: encapsulate the business rule.\n+ // Again, note how a clear function name replaces the\n+ // need for a code comment:\n+ if (outsideBusinessHours(timeReceived)) {\n return autoReplyTo(message);\n }\n \n pingAgentFor(message);\n+}\n+\n+function outsideBusinessHours(timeReceived) {\n+ // Refactoring #3: replace magic numbers with\n+ // symbols that communicate with the code reader:\n+ const closingHour = 17;\n+ const openingHour = 8;\n+\n+ const hours = timeReceived.getHours();\n+\n+ // Refactoring #4: simple conditional rules can\n+ // be further clarified by introducing a variable:\n+ const afterClosing = hours > closingHour;\n+ const beforeOpening = hours < openingHour;\n+\n+ // Yeah -- look how clear the business rule is now!\n+ return afterClosing || beforeOpening;\n }\n\\ No newline at end of file\n","language":"c#","improvement-type":"Complex Conditional"}],"change-level":"warning","is-hotspot?":false,"line":263,"what-changed":"IsClassifiable has 1 complex conditionals with 2 branches, threshold = 2","how-to-fix":"Apply the [DECOMPOSE CONDITIONAL](https://refactoring.com/catalog/decomposeConditional.html) refactoring so that the complex conditional is encapsulated in a separate function with a good name that captures the business rule. Optionally, for simple expressions, introduce a new variable which holds the result of the complex conditional.","change-type":"introduced"}]},"positive-impact-count":0,"repo":"Brighter","code-health":9.587641813303485,"version":"3.0","authors":["Stuart Lang"],"directives":{"added":[],"removed":[]},"positive-findings":{"number-of-types":0,"number-of-files-touched":0,"findings":[]},"notices":{"number-of-types":0,"number-of-files-touched":0,"findings":[]},"external-review-provider":"GitHub"},"analysistime":"2026-06-05T11:49:02.000Z","project-name":"Brighter","repository":"https://github.com/BrighterCommand/Brighter.git"}}