Skip to content

Fix ensure that node id serilizer registration has no order requirements #8216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix ensure that node id serilizer registration has no order requirements #8216

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 18 additions & 9 deletions ...e/Core/src/Execution/DependencyInjection/RequestExecutorBuilderExtensions.IdSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,31 @@ public static IRequestExecutorBuilder AddDefaultNodeIdSerializer(
throw new ArgumentNullException(nameof(builder));
}

if (!builder.Services.Any(t =>
t.ServiceType == typeof(INodeIdValueSerializer)
&& t.ImplementationType == typeof(StringNodeIdValueSerializer)))
if (!builder.Services.IsImplementationTypeRegistered<StringNodeIdValueSerializer>())
{
builder.Services.AddSingleton<INodeIdValueSerializer, StringNodeIdValueSerializer>();
builder.Services.AddSingleton<INodeIdValueSerializer, Int16NodeIdValueSerializer>();
builder.Services.AddSingleton<INodeIdValueSerializer, Int32NodeIdValueSerializer>();
builder.Services.AddSingleton<INodeIdValueSerializer, Int64NodeIdValueSerializer>();
builder.Services.AddSingleton<INodeIdValueSerializer>(new GuidNodeIdValueSerializer(compress: outputNewIdFormat));
builder.Services.AddSingleton<INodeIdValueSerializer, DecimalNodeIdValueSerializer>();
builder.Services.AddSingleton<INodeIdValueSerializer, SingleNodeIdValueSerializer>();
builder.Services.AddSingleton<INodeIdValueSerializer, DoubleNodeIdValueSerializer>();
builder.Services.AddSingleton<INodeIdValueSerializer>(new GuidNodeIdValueSerializer(compress: outputNewIdFormat));
}
else
{
// if serializers are already registered we need to replace the
// default guid serializer with the new one in order to make sure
// that we have the right settings configured for it.
var serviceRegistration = builder.Services.FirstOrDefault(
t => t.ServiceType == typeof(INodeIdValueSerializer)
&& t.ImplementationType == typeof(GuidNodeIdValueSerializer));
if (serviceRegistration is not null)
{
builder.Services.Remove(serviceRegistration);
builder.Services.AddSingleton<INodeIdValueSerializer>(
new GuidNodeIdValueSerializer(compress: outputNewIdFormat));
}
}

builder.Services.RemoveService<INodeIdSerializer>();
Expand Down Expand Up @@ -110,18 +123,14 @@ public static IRequestExecutorBuilder AddDefaultNodeIdSerializer(
/// <param name="builder">
/// The request executor builder.
/// </param>
/// <param name="maxIdLength">
/// The maximum allowed length of a node id.
/// </param>
/// <returns>
/// Returns the request executor builder.
/// </returns>
/// <exception cref="ArgumentNullException">
/// <paramref name="builder"/> is <see langword="null"/>.
/// </exception>
public static IRequestExecutorBuilder AddLegacyNodeIdSerializer(
this IRequestExecutorBuilder builder,
int maxIdLength = 1024)
this IRequestExecutorBuilder builder)
{
if (builder == null)
{
Expand Down
Loading