Make use of IValidateOptions<T> (#440)

mburumaxwell · web-flow · commit 7b53d0b8565a · 2022-08-08T12:29:19.000+03:00
This PR makes use of `services.ConfigureOptions&lt;T&gt;(...)` and `IValidateOptions&lt;T&gt;` to make configuration, post configuration and validation of options easier.
diff --git a/src/Tingle.EventBus.Serializers.NewtonsoftJson/EventBusBuilderExtensions.cs b/src/Tingle.EventBus.Serializers.NewtonsoftJson/EventBusBuilderExtensions.cs
@@ -1,5 +1,4 @@
-﻿using Microsoft.Extensions.Options;
-using Tingle.EventBus.Serializers;
+﻿using Tingle.EventBus.Serializers;
 
 namespace Microsoft.Extensions.DependencyInjection;
 
@@ -22,7 +21,7 @@ public static EventBusBuilder UseDefaultNewtonsoftJsonSerializer(this EventBusBu
         // Configure the options for the serializer
         var services = builder.Services;
         if (configure != null) services.Configure(configure);
-        services.AddSingleton<IPostConfigureOptions<NewtonsoftJsonSerializerOptions>, NewtonsoftJsonSerializerPostConfigureOptions>();
+        services.ConfigureOptions<NewtonsoftJsonSerializerConfigureOptions>();
 
         // Add the serializer
         return builder.UseDefaultSerializer<NewtonsoftJsonSerializer>();
diff --git a/src/Tingle.EventBus.Serializers.NewtonsoftJson/NewtonsoftJsonSerializerConfigureOptions.cs b/src/Tingle.EventBus.Serializers.NewtonsoftJson/NewtonsoftJsonSerializerConfigureOptions.cs
@@ -6,14 +6,16 @@ namespace Microsoft.Extensions.DependencyInjection;
 /// <summary>
 /// A class to finish the configuration of instances of <see cref="NewtonsoftJsonSerializerOptions"/>.
 /// </summary>
-internal class NewtonsoftJsonSerializerPostConfigureOptions : IPostConfigureOptions<NewtonsoftJsonSerializerOptions>
+internal class NewtonsoftJsonSerializerConfigureOptions : IValidateOptions<NewtonsoftJsonSerializerOptions>
 {
-    public void PostConfigure(string name, NewtonsoftJsonSerializerOptions options)
+    public ValidateOptionsResult Validate(string name, NewtonsoftJsonSerializerOptions options)
     {
         // Ensure the settings are provided
         if (options.SerializerSettings == null)
         {
-            throw new InvalidOperationException($"'{nameof(options.SerializerSettings)}' must be provided");
+            return ValidateOptionsResult.Fail($"'{nameof(options.SerializerSettings)}' must be provided");
         }
+
+        return ValidateOptionsResult.Success;
     }
 }
diff --git a/src/Tingle.EventBus.Transports.Amazon.Abstractions/AmazonTransportConfigureOptions.cs b/src/Tingle.EventBus.Transports.Amazon.Abstractions/AmazonTransportConfigureOptions.cs
@@ -7,7 +7,7 @@ namespace Microsoft.Extensions.DependencyInjection;
 /// <summary>
 /// A class to finish the configuration of instances of <see cref="AmazonTransportOptions"/> derivatives.
 /// </summary>
-public abstract class AmazonTransportPostConfigureOptions<TOptions> : IPostConfigureOptions<TOptions> where TOptions : AmazonTransportOptions
+public abstract class AmazonTransportConfigureOptions<TOptions> : IPostConfigureOptions<TOptions> where TOptions : AmazonTransportOptions
 {
     /// <inheritdoc/>
     public virtual void PostConfigure(string name, TOptions options)
diff --git a/src/Tingle.EventBus.Transports.Amazon.Kinesis/AmazonKinesisConfigureOptions.cs b/src/Tingle.EventBus.Transports.Amazon.Kinesis/AmazonKinesisConfigureOptions.cs
@@ -8,11 +8,11 @@ namespace Microsoft.Extensions.DependencyInjection;
 /// <summary>
 /// A class to finish the configuration of instances of <see cref="AmazonKinesisTransportOptions"/>.
 /// </summary>
-internal class AmazonKinesisPostConfigureOptions : AmazonTransportPostConfigureOptions<AmazonKinesisTransportOptions>
+internal class AmazonKinesisConfigureOptions : AmazonTransportConfigureOptions<AmazonKinesisTransportOptions>
 {
     private readonly EventBusOptions busOptions;
 
-    public AmazonKinesisPostConfigureOptions(IOptions<EventBusOptions> busOptionsAccessor)
+    public AmazonKinesisConfigureOptions(IOptions<EventBusOptions> busOptionsAccessor)
     {
         busOptions = busOptionsAccessor?.Value ?? throw new ArgumentNullException(nameof(busOptionsAccessor));
     }
diff --git a/src/Tingle.EventBus.Transports.Amazon.Kinesis/EventBusBuilderExtensions.cs b/src/Tingle.EventBus.Transports.Amazon.Kinesis/EventBusBuilderExtensions.cs
@@ -1,5 +1,4 @@
-﻿using Microsoft.Extensions.Options;
-using Tingle.EventBus.Transports.Amazon.Kinesis;
+﻿using Tingle.EventBus.Transports.Amazon.Kinesis;
 
 namespace Microsoft.Extensions.DependencyInjection;
 
@@ -23,7 +22,7 @@ public static EventBusBuilder AddAmazonKinesisTransport(this EventBusBuilder bui
 
         // Configure the options for Amazon Kinesis
         services.Configure(configure);
-        services.AddSingleton<IPostConfigureOptions<AmazonKinesisTransportOptions>, AmazonKinesisPostConfigureOptions>();
+        services.ConfigureOptions<AmazonKinesisConfigureOptions>();
 
         // Register the transport
         builder.AddTransport<AmazonKinesisTransport, AmazonKinesisTransportOptions>();
diff --git a/src/Tingle.EventBus.Transports.Amazon.Sqs/AmazonSqsConfigureOptions.cs b/src/Tingle.EventBus.Transports.Amazon.Sqs/AmazonSqsConfigureOptions.cs
@@ -9,11 +9,11 @@ namespace Microsoft.Extensions.DependencyInjection;
 /// <summary>
 /// A class to finish the configuration of instances of <see cref="AmazonSqsTransportOptions"/>.
 /// </summary>
-internal class AmazonSqsPostConfigureOptions : AmazonTransportPostConfigureOptions<AmazonSqsTransportOptions>
+internal class AmazonSqsConfigureOptions : AmazonTransportConfigureOptions<AmazonSqsTransportOptions>
 {
     private readonly EventBusOptions busOptions;
 
-    public AmazonSqsPostConfigureOptions(IOptions<EventBusOptions> busOptionsAccessor)
+    public AmazonSqsConfigureOptions(IOptions<EventBusOptions> busOptionsAccessor)
     {
         busOptions = busOptionsAccessor?.Value ?? throw new ArgumentNullException(nameof(busOptionsAccessor));
     }
diff --git a/src/Tingle.EventBus.Transports.Amazon.Sqs/EventBusBuilderExtensions.cs b/src/Tingle.EventBus.Transports.Amazon.Sqs/EventBusBuilderExtensions.cs
@@ -1,5 +1,4 @@
-﻿using Microsoft.Extensions.Options;
-using Tingle.EventBus.Transports.Amazon.Sqs;
+﻿using Tingle.EventBus.Transports.Amazon.Sqs;
 
 namespace Microsoft.Extensions.DependencyInjection;
 
@@ -23,7 +22,7 @@ public static EventBusBuilder AddAmazonSqsTransport(this EventBusBuilder builder
 
         // configure the options for Amazon SQS and SNS option
         services.Configure(configure);
-        services.AddSingleton<IPostConfigureOptions<AmazonSqsTransportOptions>, AmazonSqsPostConfigureOptions>();
+        services.ConfigureOptions<AmazonSqsConfigureOptions>();
 
         // register the transport
         builder.AddTransport<AmazonSqsTransport, AmazonSqsTransportOptions>();
diff --git a/src/Tingle.EventBus.Transports.Azure.Abstractions/AzureTransportConfigureOptions.cs b/src/Tingle.EventBus.Transports.Azure.Abstractions/AzureTransportConfigureOptions.cs
@@ -5,23 +5,31 @@ namespace Microsoft.Extensions.DependencyInjection;
 /// <summary>
 /// A class to finish the configuration of instances of <see cref="AzureTransportOptions{TCredential}"/> derivatives.
 /// </summary>
-public abstract class AzureTransportPostConfigureOptions<TCredential, TOptions> : IPostConfigureOptions<TOptions>
+public abstract class AzureTransportConfigureOptions<TCredential, TOptions> : IPostConfigureOptions<TOptions>, IValidateOptions<TOptions>
     where TCredential : AzureTransportCredentials
     where TOptions : AzureTransportOptions<TCredential>
 {
     /// <inheritdoc/>
     public virtual void PostConfigure(string name, TOptions options)
+    {
+        // intentionally left bank for future use
+    }
+
+    /// <inheritdoc/>
+    public virtual ValidateOptionsResult Validate(string name, TOptions options)
     {
         // We should either have a token credential or a connection string
         if (options.Credentials is null || options.Credentials.Value is null)
         {
-            throw new InvalidOperationException($"'{nameof(options.Credentials)}' must be provided in form a connection string or an instance of '{typeof(TCredential).Name}'.");
+            return ValidateOptionsResult.Fail($"'{nameof(options.Credentials)}' must be provided in form a connection string or an instance of '{typeof(TCredential).Name}'.");
         }
 
         // We must have TokenCredential if using TCredential
         if (options.Credentials.Value is TCredential tc && tc.TokenCredential is null)
         {
-            throw new InvalidOperationException($"'{nameof(tc.TokenCredential)}' must be provided when using '{typeof(TCredential).Name}'.");
+            return ValidateOptionsResult.Fail($"'{nameof(tc.TokenCredential)}' must be provided when using '{typeof(TCredential).Name}'.");
         }
+
+        return ValidateOptionsResult.Success;
     }
 }
diff --git a/src/Tingle.EventBus.Transports.Azure.EventHubs/AzureEventHubsConfigureOptions.cs b/src/Tingle.EventBus.Transports.Azure.EventHubs/AzureEventHubsConfigureOptions.cs
@@ -7,11 +7,11 @@ namespace Microsoft.Extensions.DependencyInjection;
 /// <summary>
 /// A class to finish the configuration of instances of <see cref="AzureEventHubsTransportOptions"/>.
 /// </summary>
-internal class AzureEventHubsPostConfigureOptions : AzureTransportPostConfigureOptions<AzureEventHubsTransportCredentials, AzureEventHubsTransportOptions>
+internal class AzureEventHubsConfigureOptions : AzureTransportConfigureOptions<AzureEventHubsTransportCredentials, AzureEventHubsTransportOptions>
 {
     private readonly EventBusOptions busOptions;
 
-    public AzureEventHubsPostConfigureOptions(IOptions<EventBusOptions> busOptionsAccessor)
+    public AzureEventHubsConfigureOptions(IOptions<EventBusOptions> busOptionsAccessor)
     {
         busOptions = busOptionsAccessor?.Value ?? throw new ArgumentNullException(nameof(busOptionsAccessor));
     }
diff --git a/src/Tingle.EventBus.Transports.Azure.EventHubs/EventBusBuilderExtensions.cs b/src/Tingle.EventBus.Transports.Azure.EventHubs/EventBusBuilderExtensions.cs
@@ -1,5 +1,4 @@
-﻿using Microsoft.Extensions.Options;
-using Tingle.EventBus.Transports.Azure.EventHubs;
+﻿using Tingle.EventBus.Transports.Azure.EventHubs;
 
 namespace Microsoft.Extensions.DependencyInjection;
 
@@ -23,7 +22,7 @@ public static EventBusBuilder AddAzureEventHubsTransport(this EventBusBuilder bu
 
         // configure the options for Azure Event Hubs
         services.Configure(configure);
-        services.AddSingleton<IPostConfigureOptions<AzureEventHubsTransportOptions>, AzureEventHubsPostConfigureOptions>();
+        services.ConfigureOptions<AzureEventHubsConfigureOptions>();
 
         // register the transport
         builder.AddTransport<AzureEventHubsTransport, AzureEventHubsTransportOptions>();
diff --git a/src/Tingle.EventBus.Transports.Azure.QueueStorage/AzureQueueStorageConfigureOptions.cs b/src/Tingle.EventBus.Transports.Azure.QueueStorage/AzureQueueStorageConfigureOptions.cs
@@ -7,11 +7,11 @@ namespace Microsoft.Extensions.DependencyInjection;
 /// <summary>
 /// A class to finish the configuration of instances of <see cref="AzureQueueStorageTransportOptions"/>.
 /// </summary>
-internal class AzureQueueStoragePostConfigureOptions : AzureTransportPostConfigureOptions<AzureQueueStorageTransportCredentials, AzureQueueStorageTransportOptions>
+internal class AzureQueueStorageConfigureOptions : AzureTransportConfigureOptions<AzureQueueStorageTransportCredentials, AzureQueueStorageTransportOptions>
 {
     private readonly EventBusOptions busOptions;
 
-    public AzureQueueStoragePostConfigureOptions(IOptions<EventBusOptions> busOptionsAccessor)
+    public AzureQueueStorageConfigureOptions(IOptions<EventBusOptions> busOptionsAccessor)
     {
         busOptions = busOptionsAccessor?.Value ?? throw new ArgumentNullException(nameof(busOptionsAccessor));
     }
diff --git a/src/Tingle.EventBus.Transports.Azure.QueueStorage/EventBusBuilderExtensions.cs b/src/Tingle.EventBus.Transports.Azure.QueueStorage/EventBusBuilderExtensions.cs
@@ -1,5 +1,4 @@
-﻿using Microsoft.Extensions.Options;
-using Tingle.EventBus.Transports.Azure.QueueStorage;
+﻿using Tingle.EventBus.Transports.Azure.QueueStorage;
 
 namespace Microsoft.Extensions.DependencyInjection;
 
@@ -23,7 +22,7 @@ public static EventBusBuilder AddAzureQueueStorageTransport(this EventBusBuilder
 
         // configure the options for Azure Queue Storage
         services.Configure(configure);
-        services.AddSingleton<IPostConfigureOptions<AzureQueueStorageTransportOptions>, AzureQueueStoragePostConfigureOptions>();
+        services.ConfigureOptions<AzureQueueStorageConfigureOptions>();
 
         // register the transport
         builder.AddTransport<AzureQueueStorageTransport, AzureQueueStorageTransportOptions>();
diff --git a/src/Tingle.EventBus.Transports.Azure.ServiceBus/AzureServiceBusConfigureOptions.cs b/src/Tingle.EventBus.Transports.Azure.ServiceBus/AzureServiceBusConfigureOptions.cs
@@ -7,11 +7,11 @@ namespace Microsoft.Extensions.DependencyInjection;
 /// <summary>
 /// A class to finish the configuration of instances of <see cref="AzureServiceBusTransportOptions"/>.
 /// </summary>
-internal class AzureServiceBusPostConfigureOptions : AzureTransportPostConfigureOptions<AzureServiceBusTransportCredentials, AzureServiceBusTransportOptions>
+internal class AzureServiceBusConfigureOptions : AzureTransportConfigureOptions<AzureServiceBusTransportCredentials, AzureServiceBusTransportOptions>
 {
     private readonly EventBusOptions busOptions;
 
-    public AzureServiceBusPostConfigureOptions(IOptions<EventBusOptions> busOptionsAccessor)
+    public AzureServiceBusConfigureOptions(IOptions<EventBusOptions> busOptionsAccessor)
     {
         busOptions = busOptionsAccessor?.Value ?? throw new ArgumentNullException(nameof(busOptionsAccessor));
     }
diff --git a/src/Tingle.EventBus.Transports.Azure.ServiceBus/EventBusBuilderExtensions.cs b/src/Tingle.EventBus.Transports.Azure.ServiceBus/EventBusBuilderExtensions.cs
@@ -1,5 +1,4 @@
-﻿using Microsoft.Extensions.Options;
-using Tingle.EventBus.Transports.Azure.ServiceBus;
+﻿using Tingle.EventBus.Transports.Azure.ServiceBus;
 
 namespace Microsoft.Extensions.DependencyInjection;
 
@@ -23,7 +22,7 @@ public static EventBusBuilder AddAzureServiceBusTransport(this EventBusBuilder b
 
         // configure the options for Azure Service Bus
         services.Configure(configure);
-        services.AddSingleton<IPostConfigureOptions<AzureServiceBusTransportOptions>, AzureServiceBusPostConfigureOptions>();
+        services.ConfigureOptions<AzureServiceBusConfigureOptions>();
 
         // register the transport
         builder.AddTransport<AzureServiceBusTransport, AzureServiceBusTransportOptions>();
diff --git a/src/Tingle.EventBus.Transports.InMemory/EventBusBuilderExtensions.cs b/src/Tingle.EventBus.Transports.InMemory/EventBusBuilderExtensions.cs
@@ -1,5 +1,4 @@
-﻿using Microsoft.Extensions.Options;
-using Tingle.EventBus.Transports.InMemory;
+﻿using Tingle.EventBus.Transports.InMemory;
 using Tingle.EventBus.Transports.InMemory.Client;
 
 namespace Microsoft.Extensions.DependencyInjection;
@@ -28,7 +27,7 @@ public static EventBusBuilder AddInMemoryTransport(this EventBusBuilder builder,
             services.Configure(configure);
         }
 
-        services.AddSingleton<IPostConfigureOptions<InMemoryTransportOptions>, InMemoryTransportPostConfigureOptions>();
+        services.ConfigureOptions<InMemoryTransportConfigureOptions>();
         services.AddSingleton<SequenceNumberGenerator>();
 
         // register the transport
@@ -64,7 +63,7 @@ public static EventBusBuilder AddInMemoryTestHarness(this EventBusBuilder builde
         services.AddSingleton<InMemoryTestHarness>();
 
         // Set the delivery delay to zero for instance delivery
-        services.AddSingleton<IPostConfigureOptions<InMemoryTestHarnessOptions>, InMemoryTestHarnessPostConfigureOptions>();
+        services.ConfigureOptions<InMemoryTestHarnessConfigureOptions>();
 
         return builder;
     }
diff --git a/src/Tingle.EventBus.Transports.InMemory/InMemoryTestHarnessConfigureOptions.cs b/src/Tingle.EventBus.Transports.InMemory/InMemoryTestHarnessConfigureOptions.cs
@@ -5,7 +5,7 @@ namespace Microsoft.Extensions.DependencyInjection;
 /// <summary>
 /// A class to finish the configuration of instances of <see cref="InMemoryTestHarnessOptions"/>.
 /// </summary>
-internal class InMemoryTestHarnessPostConfigureOptions : IPostConfigureOptions<InMemoryTestHarnessOptions>
+internal class InMemoryTestHarnessConfigureOptions : IPostConfigureOptions<InMemoryTestHarnessOptions>
 {
     public void PostConfigure(string name, InMemoryTestHarnessOptions options)
     {
diff --git a/src/Tingle.EventBus.Transports.InMemory/InMemoryTransportConfigureOptions.cs b/src/Tingle.EventBus.Transports.InMemory/InMemoryTransportConfigureOptions.cs
@@ -7,11 +7,11 @@ namespace Microsoft.Extensions.DependencyInjection;
 /// <summary>
 /// A class to finish the configuration of instances of <see cref="InMemoryTransportOptions"/>.
 /// </summary>
-internal class InMemoryTransportPostConfigureOptions : IPostConfigureOptions<InMemoryTransportOptions>
+internal class InMemoryTransportConfigureOptions : IPostConfigureOptions<InMemoryTransportOptions>
 {
     private readonly EventBusOptions busOptions;
 
-    public InMemoryTransportPostConfigureOptions(IOptions<EventBusOptions> busOptionsAccessor)
+    public InMemoryTransportConfigureOptions(IOptions<EventBusOptions> busOptionsAccessor)
     {
         busOptions = busOptionsAccessor?.Value ?? throw new ArgumentNullException(nameof(busOptionsAccessor));
     }
diff --git a/src/Tingle.EventBus.Transports.Kafka/EventBusBuilderExtensions.cs b/src/Tingle.EventBus.Transports.Kafka/EventBusBuilderExtensions.cs
@@ -1,5 +1,4 @@
-﻿using Microsoft.Extensions.Options;
-using Tingle.EventBus.Transports.Kafka;
+﻿using Tingle.EventBus.Transports.Kafka;
 
 namespace Microsoft.Extensions.DependencyInjection;
 
@@ -23,7 +22,7 @@ public static EventBusBuilder AddKafkaTransport(this EventBusBuilder builder, Ac
 
         // configure the options for Kafka
         services.Configure(configure);
-        services.AddSingleton<IPostConfigureOptions<KafkaTransportOptions>, KafkaPostConfigureOptions>();
+        services.ConfigureOptions<KafkaConfigureOptions>();
 
         // register the transport
         builder.AddTransport<KafkaTransport, KafkaTransportOptions>();
diff --git a/src/Tingle.EventBus.Transports.Kafka/KafkaConfigureOptions.cs b/src/Tingle.EventBus.Transports.Kafka/KafkaConfigureOptions.cs
@@ -8,11 +8,11 @@ namespace Microsoft.Extensions.DependencyInjection;
 /// <summary>
 /// A class to finish the configuration of instances of <see cref="KafkaTransportOptions"/>.
 /// </summary>
-internal class KafkaPostConfigureOptions : IPostConfigureOptions<KafkaTransportOptions>
+internal class KafkaConfigureOptions : IPostConfigureOptions<KafkaTransportOptions>
 {
     private readonly EventBusOptions busOptions;
 
-    public KafkaPostConfigureOptions(IOptions<EventBusOptions> busOptionsAccessor)
+    public KafkaConfigureOptions(IOptions<EventBusOptions> busOptionsAccessor)
     {
         busOptions = busOptionsAccessor?.Value ?? throw new ArgumentNullException(nameof(busOptionsAccessor));
     }
diff --git a/src/Tingle.EventBus.Transports.RabbitMQ/EventBusBuilderExtensions.cs b/src/Tingle.EventBus.Transports.RabbitMQ/EventBusBuilderExtensions.cs
@@ -1,5 +1,4 @@
-﻿using Microsoft.Extensions.Options;
-using Tingle.EventBus.Transports.RabbitMQ;
+﻿using Tingle.EventBus.Transports.RabbitMQ;
 
 namespace Microsoft.Extensions.DependencyInjection;
 
@@ -23,7 +22,7 @@ public static EventBusBuilder AddRabbitMqTransport(this EventBusBuilder builder,
 
         // configure the options for RabbitMQ
         services.Configure(configure);
-        services.AddSingleton<IPostConfigureOptions<RabbitMqTransportOptions>, RabbitMqPostConfigureOptions>();
+        services.ConfigureOptions<RabbitMqConfigureOptions>();
 
         // register the transport
         builder.AddTransport<RabbitMqTransport, RabbitMqTransportOptions>();
diff --git a/src/Tingle.EventBus.Transports.RabbitMQ/RabbitMqConfigureOptions.cs b/src/Tingle.EventBus.Transports.RabbitMQ/RabbitMqConfigureOptions.cs
@@ -8,11 +8,11 @@ namespace Microsoft.Extensions.DependencyInjection;
 /// <summary>
 /// A class to finish the configuration of instances of <see cref="RabbitMqTransportOptions"/>.
 /// </summary>
-internal class RabbitMqPostConfigureOptions : IPostConfigureOptions<RabbitMqTransportOptions>
+internal class RabbitMqConfigureOptions : IPostConfigureOptions<RabbitMqTransportOptions>
 {
     private readonly EventBusOptions busOptions;
 
-    public RabbitMqPostConfigureOptions(IOptions<EventBusOptions> busOptionsAccessor)
+    public RabbitMqConfigureOptions(IOptions<EventBusOptions> busOptionsAccessor)
     {
         busOptions = busOptionsAccessor?.Value ?? throw new ArgumentNullException(nameof(busOptionsAccessor));
     }
diff --git a/src/Tingle.EventBus/DependencyInjection/EventBusBuilder.cs b/src/Tingle.EventBus/DependencyInjection/EventBusBuilder.cs
@@ -1,5 +1,4 @@
 ﻿using Microsoft.Extensions.Diagnostics.HealthChecks;
-using Microsoft.Extensions.Options;
 using Tingle.EventBus;
 using Tingle.EventBus.Configuration;
 using Tingle.EventBus.Ids;
@@ -90,7 +89,7 @@ public EventBusBuilder AddTransport<TTransport, TOptions>()
         where TOptions : EventBusTransportOptionsBase
     {
         // Post configure the common transport options
-        Services.AddSingleton<IPostConfigureOptions<TOptions>, TransportOptionsPostConfigureOptions<TOptions>>();
+        Services.ConfigureOptions<TransportOptionsConfigureOptions<TOptions>>();
 
         // Register for resolution
         Services.AddSingleton<IEventBusTransport, TTransport>();
diff --git a/src/Tingle.EventBus/DependencyInjection/EventBusConfigureOptions.cs b/src/Tingle.EventBus/DependencyInjection/EventBusConfigureOptions.cs
diff --git a/src/Tingle.EventBus/DependencyInjection/TransportOptionsConfigureOptions.cs b/src/Tingle.EventBus/DependencyInjection/TransportOptionsConfigureOptions.cs
diff --git a/src/Tingle.EventBus/Serialization/Xml/EventBusBuilderExtensions.cs b/src/Tingle.EventBus/Serialization/Xml/EventBusBuilderExtensions.cs
diff --git a/src/Tingle.EventBus/Serialization/Xml/XmlEventSerializerConfigureOptions.cs b/src/Tingle.EventBus/Serialization/Xml/XmlEventSerializerConfigureOptions.cs

Original file line number	Diff line number	Diff line change
`@@ -6,14 +6,16 @@ namespace Microsoft.Extensions.DependencyInjection;`
`6`	`6`	`/// <summary>`
`7`	`7`	`/// A class to finish the configuration of instances of <see cref="NewtonsoftJsonSerializerOptions"/>.`
`8`	`8`	`/// </summary>`
`9`		`-internal class NewtonsoftJsonSerializerPostConfigureOptions : IPostConfigureOptions<NewtonsoftJsonSerializerOptions>`
	`9`	`+internal class NewtonsoftJsonSerializerConfigureOptions : IValidateOptions<NewtonsoftJsonSerializerOptions>`
`10`	`10`	`{`
`11`		`- public void PostConfigure(string name, NewtonsoftJsonSerializerOptions options)`
	`11`	`+ public ValidateOptionsResult Validate(string name, NewtonsoftJsonSerializerOptions options)`
`12`	`12`	`{`
`13`	`13`	`// Ensure the settings are provided`
`14`	`14`	`if (options.SerializerSettings == null)`
`15`	`15`	`{`
`16`		`- throw new InvalidOperationException($"'{nameof(options.SerializerSettings)}' must be provided");`
	`16`	`+ return ValidateOptionsResult.Fail($"'{nameof(options.SerializerSettings)}' must be provided");`
`17`	`17`	`}`
	`18`	`+`
	`19`	`+ return ValidateOptionsResult.Success;`
`18`	`20`	`}`
`19`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ namespace Microsoft.Extensions.DependencyInjection;`
`7`	`7`	`/// <summary>`
`8`	`8`	`/// A class to finish the configuration of instances of <see cref="AmazonTransportOptions"/> derivatives.`
`9`	`9`	`/// </summary>`
`10`		`-public abstract class AmazonTransportPostConfigureOptions<TOptions> : IPostConfigureOptions<TOptions> where TOptions : AmazonTransportOptions`
	`10`	`+public abstract class AmazonTransportConfigureOptions<TOptions> : IPostConfigureOptions<TOptions> where TOptions : AmazonTransportOptions`
`11`	`11`	`{`
`12`	`12`	`/// <inheritdoc/>`
`13`	`13`	`public virtual void PostConfigure(string name, TOptions options)`
Original file line number	Diff line number	Diff line change
`@@ -8,11 +8,11 @@ namespace Microsoft.Extensions.DependencyInjection;`
`8`	`8`	`/// <summary>`
`9`	`9`	`/// A class to finish the configuration of instances of <see cref="AmazonKinesisTransportOptions"/>.`
`10`	`10`	`/// </summary>`
`11`		`-internal class AmazonKinesisPostConfigureOptions : AmazonTransportPostConfigureOptions<AmazonKinesisTransportOptions>`
	`11`	`+internal class AmazonKinesisConfigureOptions : AmazonTransportConfigureOptions<AmazonKinesisTransportOptions>`
`12`	`12`	`{`
`13`	`13`	`private readonly EventBusOptions busOptions;`
`14`	`14`
`15`		`- public AmazonKinesisPostConfigureOptions(IOptions<EventBusOptions> busOptionsAccessor)`
	`15`	`+ public AmazonKinesisConfigureOptions(IOptions<EventBusOptions> busOptionsAccessor)`
`16`	`16`	`{`
`17`	`17`	`busOptions = busOptionsAccessor?.Value ?? throw new ArgumentNullException(nameof(busOptionsAccessor));`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,11 @@ namespace Microsoft.Extensions.DependencyInjection;`
`9`	`9`	`/// <summary>`
`10`	`10`	`/// A class to finish the configuration of instances of <see cref="AmazonSqsTransportOptions"/>.`
`11`	`11`	`/// </summary>`
`12`		`-internal class AmazonSqsPostConfigureOptions : AmazonTransportPostConfigureOptions<AmazonSqsTransportOptions>`
	`12`	`+internal class AmazonSqsConfigureOptions : AmazonTransportConfigureOptions<AmazonSqsTransportOptions>`
`13`	`13`	`{`
`14`	`14`	`private readonly EventBusOptions busOptions;`
`15`	`15`
`16`		`- public AmazonSqsPostConfigureOptions(IOptions<EventBusOptions> busOptionsAccessor)`
	`16`	`+ public AmazonSqsConfigureOptions(IOptions<EventBusOptions> busOptionsAccessor)`
`17`	`17`	`{`
`18`	`18`	`busOptions = busOptionsAccessor?.Value ?? throw new ArgumentNullException(nameof(busOptionsAccessor));`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,23 +5,31 @@ namespace Microsoft.Extensions.DependencyInjection;`
`5`	`5`	`/// <summary>`
`6`	`6`	`/// A class to finish the configuration of instances of <see cref="AzureTransportOptions{TCredential}"/> derivatives.`
`7`	`7`	`/// </summary>`
`8`		`-public abstract class AzureTransportPostConfigureOptions<TCredential, TOptions> : IPostConfigureOptions<TOptions>`
	`8`	`+public abstract class AzureTransportConfigureOptions<TCredential, TOptions> : IPostConfigureOptions<TOptions>, IValidateOptions<TOptions>`
`9`	`9`	`where TCredential : AzureTransportCredentials`
`10`	`10`	`where TOptions : AzureTransportOptions<TCredential>`
`11`	`11`	`{`
`12`	`12`	`/// <inheritdoc/>`
`13`	`13`	`public virtual void PostConfigure(string name, TOptions options)`
	`14`	`+ {`
	`15`	`+ // intentionally left bank for future use`
	`16`	`+ }`
	`17`	`+`
	`18`	`+ /// <inheritdoc/>`
	`19`	`+ public virtual ValidateOptionsResult Validate(string name, TOptions options)`
`14`	`20`	`{`
`15`	`21`	`// We should either have a token credential or a connection string`
`16`	`22`	`if (options.Credentials is null \|\| options.Credentials.Value is null)`
`17`	`23`	`{`
`18`		`- throw new InvalidOperationException($"'{nameof(options.Credentials)}' must be provided in form a connection string or an instance of '{typeof(TCredential).Name}'.");`
	`24`	`+ return ValidateOptionsResult.Fail($"'{nameof(options.Credentials)}' must be provided in form a connection string or an instance of '{typeof(TCredential).Name}'.");`
`19`	`25`	`}`
`20`	`26`
`21`	`27`	`// We must have TokenCredential if using TCredential`
`22`	`28`	`if (options.Credentials.Value is TCredential tc && tc.TokenCredential is null)`
`23`	`29`	`{`
`24`		`- throw new InvalidOperationException($"'{nameof(tc.TokenCredential)}' must be provided when using '{typeof(TCredential).Name}'.");`
	`30`	`+ return ValidateOptionsResult.Fail($"'{nameof(tc.TokenCredential)}' must be provided when using '{typeof(TCredential).Name}'.");`
`25`	`31`	`}`
	`32`	`+`
	`33`	`+ return ValidateOptionsResult.Success;`
`26`	`34`	`}`
`27`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,11 +7,11 @@ namespace Microsoft.Extensions.DependencyInjection;`
`7`	`7`	`/// <summary>`
`8`	`8`	`/// A class to finish the configuration of instances of <see cref="AzureEventHubsTransportOptions"/>.`
`9`	`9`	`/// </summary>`
`10`		`-internal class AzureEventHubsPostConfigureOptions : AzureTransportPostConfigureOptions<AzureEventHubsTransportCredentials, AzureEventHubsTransportOptions>`
	`10`	`+internal class AzureEventHubsConfigureOptions : AzureTransportConfigureOptions<AzureEventHubsTransportCredentials, AzureEventHubsTransportOptions>`
`11`	`11`	`{`
`12`	`12`	`private readonly EventBusOptions busOptions;`
`13`	`13`
`14`		`- public AzureEventHubsPostConfigureOptions(IOptions<EventBusOptions> busOptionsAccessor)`
	`14`	`+ public AzureEventHubsConfigureOptions(IOptions<EventBusOptions> busOptionsAccessor)`
`15`	`15`	`{`
`16`	`16`	`busOptions = busOptionsAccessor?.Value ?? throw new ArgumentNullException(nameof(busOptionsAccessor));`
`17`	`17`	`}`