Skip to content
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.

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

Use C# 12 collection expressions #6852

Merged
merged 1 commit into from
Sep 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ static void SetEntry(ContextBag context, Guid sagaId, Entry value)
{
if (context.TryGet(ContextKey, out Dictionary<Guid, Entry> entries) == false)
{
entries = new Dictionary<Guid, Entry>();
entries = [];
context.Set(ContextKey, entries);
}
entries[sagaId] = value;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class EndpointBehavior : IComponentBehavior
public EndpointBehavior(IEndpointConfigurationFactory endpointBuilder)
{
EndpointBuilder = endpointBuilder;
CustomConfig = new List<Action<EndpointConfiguration, ScenarioContext>>();
CustomConfig = [];
ConfigureHowToCreateInstance(config => Endpoint.Create(config), startable => startable.Start());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ static List<Func<IServiceProvider, FeatureStartupTask>> GetStartupTaskRegistrati
{
if (!endpointConfiguration.Settings.TryGet<List<Func<IServiceProvider, FeatureStartupTask>>>(FeatureStartupTaskRunner.ConfigKey, out var startupTasks))
{
startupTasks = new List<Func<IServiceProvider, FeatureStartupTask>>();
startupTasks = [];
endpointConfiguration.Settings.Set(FeatureStartupTaskRunner.ConfigKey, startupTasks);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class Context : ScenarioContext
{
public Context()
{
EventsSubscribedTo = new List<Type>();
EventsSubscribedTo = [];
}

public List<Type> EventsSubscribedTo { get; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class Context : ScenarioContext
{
public Context()
{
EventsSubscribedTo = new List<Type>();
EventsSubscribedTo = [];
}

public List<Type> EventsSubscribedTo { get; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class Context : ScenarioContext
{
public Context()
{
EventsSubscribedTo = new List<Type>();
EventsSubscribedTo = [];
}

public List<Type> EventsSubscribedTo { get; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class Context : ScenarioContext
{
public Context()
{
EventsSubscribedTo = new List<string>();
EventsSubscribedTo = [];
}

public List<string> EventsSubscribedTo { get; }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ class BehaviorRegistrationsCoordinatorTests
[SetUp]
public void Setup()
{
replacements = new List<ReplaceStep>();
addOrReplacements = new List<RegisterOrReplaceStep>();
replacements = [];
addOrReplacements = [];

coordinator = new StepRegistrationsCoordinator(replacements, addOrReplacements);
}
Expand Down
2 changes: 1 addition & 1 deletion src/NServiceBus.Core.Tests/Serializers/XML/Pull_819.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public void Should_check_for_ignore_attribute_before_checking_type()
#pragma warning disable DE0006
m3.List = new ArrayList();
#pragma warning restore DE0006
m3.GenericList = new List<string>();
m3.GenericList = [];
});

Assert.AreEqual("John", result.FirstName);
Expand Down
34 changes: 17 additions & 17 deletions src/NServiceBus.Core.Tests/Serializers/XML/SerializerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,7 @@ public void TestInterfaces()
Accuracy = 0.314M
};

o.Names = new List<IFirstSerializableMessage>();
o.Names = [];
for (var i = 0; i < number; i++)
{
var firstMessage = mapper.CreateInstance<IFirstSerializableMessage>();
Expand Down Expand Up @@ -822,13 +822,13 @@ public void SerializeLists()
var serializer = SerializerFactory.Create<MessageWithList>();
var msg = mapper.CreateInstance<MessageWithList>();

msg.Items = new List<MessageWithListItem>
{
msg.Items =
[
new MessageWithListItem
{
Data = "Hello"
}
};
];

using (var stream = new MemoryStream())
{
Expand All @@ -848,13 +848,13 @@ public void SerializeClosedGenericListsInAlternateNamespace()
var serializer = SerializerFactory.Create<MessageWithClosedListInAlternateNamespace>();
var msg = mapper.CreateInstance<MessageWithClosedListInAlternateNamespace>();

msg.Items = new AlternateItemList
{
msg.Items =
[
new MessageWithListItemAlternate
{
Data = "Hello"
}
};
];

using (var stream = new MemoryStream())
{
Expand All @@ -874,13 +874,13 @@ public void SerializeClosedGenericListsInAlternateNamespaceMultipleIEnumerableIm
var serializer = SerializerFactory.Create<MessageWithClosedListInAlternateNamespaceMultipleIEnumerableImplementations>();
var msg = mapper.CreateInstance<MessageWithClosedListInAlternateNamespaceMultipleIEnumerableImplementations>();

msg.Items = new AlternateItemListMultipleIEnumerableImplementations
{
msg.Items =
[
new MessageWithListItemAlternate
{
Data = "Hello"
}
};
];

using (var stream = new MemoryStream())
{
Expand All @@ -900,13 +900,13 @@ public void SerializeClosedGenericListsInAlternateNamespaceMultipleIListImplemen
var serializer = SerializerFactory.Create<MessageWithClosedListInAlternateNamespaceMultipleIListImplementations>();
var msg = mapper.CreateInstance<MessageWithClosedListInAlternateNamespaceMultipleIListImplementations>();

msg.Items = new AlternateItemListMultipleIListImplementations
{
msg.Items =
[
new MessageWithListItemAlternate
{
Data = "Hello"
}
};
];

using (var stream = new MemoryStream())
{
Expand All @@ -926,13 +926,13 @@ public void SerializeClosedGenericListsInSameNamespace()
var serializer = SerializerFactory.Create<MessageWithClosedList>();
var msg = mapper.CreateInstance<MessageWithClosedList>();

msg.Items = new ItemList
{
msg.Items =
[
new MessageWithListItem
{
Data = "Hello"
}
};
];

using (var stream = new MemoryStream())
{
Expand All @@ -952,7 +952,7 @@ public void SerializeEmptyLists()
var serializer = SerializerFactory.Create<MessageWithList>();
var msg = mapper.CreateInstance<MessageWithList>();

msg.Items = new List<MessageWithListItem>();
msg.Items = [];

using (var stream = new MemoryStream())
{
Expand Down
2 changes: 1 addition & 1 deletion src/NServiceBus.Core/Audit/AuditContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public AuditContext(OutgoingMessage message, string auditAddress, TimeSpan? time
Message = message;
AuditAddress = auditAddress;
TimeToBeReceived = timeToBeReceived;
AuditMetadata = new Dictionary<string, string>();
AuditMetadata = [];
AuditAction = RouteToAudit.Instance;
}

Expand Down
2 changes: 1 addition & 1 deletion src/NServiceBus.Core/Extensibility/ExtendableOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public abstract class ExtendableOptions
protected ExtendableOptions()
{
Context = new ContextBag();
OutgoingHeaders = new Dictionary<string, string>();
OutgoingHeaders = [];
}

internal DispatchProperties DispatchProperties { get; } = new DispatchProperties();
Expand Down
2 changes: 1 addition & 1 deletion src/NServiceBus.Core/Features/Feature.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public abstract class Feature
/// </summary>
protected Feature()
{
Dependencies = new List<List<string>>();
Dependencies = [];
Name = GetFeatureName(GetType());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ internal FeatureConfigurationContext(
Routing = routing;
this.receiveConfiguration = receiveConfiguration;

TaskControllers = new List<FeatureStartupTaskController>();
TaskControllers = [];
}

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion src/NServiceBus.Core/Features/PrerequisiteStatus.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ class PrerequisiteStatus
{
internal PrerequisiteStatus()
{
Reasons = new List<string>();
Reasons = [];
IsSatisfied = true;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ public class AssemblyScannerResults
/// </summary>
public AssemblyScannerResults()
{
Assemblies = new List<Assembly>();
Types = new List<Type>();
SkippedFiles = new List<SkippedFile>();
Assemblies = [];
Types = [];
SkippedFiles = [];
}

/// <summary>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public static AssemblyScanningComponent Initialize(Configuration configuration,
var directoryToScan = AppDomain.CurrentDomain.RelativeSearchPath ?? AppDomain.CurrentDomain.BaseDirectory;

assemblyScanner = new AssemblyScanner(directoryToScan);
availableTypes = new List<Type>();
availableTypes = [];
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion src/NServiceBus.Core/Persistence/PersistenceExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public PersistenceExtensions(Type definitionType, SettingsHolder settings, Type
{
if (!Settings.TryGet("PersistenceDefinitions", out List<EnabledPersistence> definitions))
{
definitions = new List<EnabledPersistence>();
definitions = [];
Settings.Set("PersistenceDefinitions", definitions);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public static TransportOperation ToTransportOperation(this IRoutingContext conte

if (!context.Extensions.TryGet(out DispatchProperties dispatchProperties))
{
dispatchProperties = new DispatchProperties();
dispatchProperties = [];
}

var transportOperation = new TransportOperation(message, addressLabel, dispatchProperties, dispatchConsistency);
Expand Down
2 changes: 1 addition & 1 deletion src/NServiceBus.Core/Pipeline/Pipeline.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public Pipeline(IServiceProvider builder, PipelineModifications pipelineModifica
List<Expression> expressions = null;
if (Logger.IsDebugEnabled)
{
expressions = new List<Expression>();
expressions = [];
}

pipeline = behaviors.CreatePipelineExecutionFuncFor<TContext>(expressions);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public Configuration(string queueNameBase,
IsSendOnlyEndpoint = isSendOnlyEndpoint;
PipelineCompletedSubscribers = pipelineCompletedSubscribers;
ExecuteTheseHandlersFirst = executeTheseHandlersFirst;
satelliteDefinitions = new List<SatelliteDefinition>();
satelliteDefinitions = [];
this.messageHandlerRegistry = messageHandlerRegistry;
CreateQueues = createQueues;
Conventions = conventions;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public static void AddUnrecoverableException(this SettingsHolder settings, Type

if (!settings.TryGet(RecoverabilityComponent.UnrecoverableExceptions, out HashSet<Type> unrecoverableExceptions))
{
unrecoverableExceptions = new HashSet<Type>();
unrecoverableExceptions = [];
settings.Set(RecoverabilityComponent.UnrecoverableExceptions, unrecoverableExceptions);
}

Expand Down
2 changes: 1 addition & 1 deletion src/NServiceBus.Core/Routing/EndpointInstances.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public void AddOrReplaceInstances(string sourceKey, IList<EndpointInstance> endp
{
if (!newCache.TryGetValue(instance.Endpoint, out var instanceSet))
{
instanceSet = new HashSet<EndpointInstance>();
instanceSet = [];
newCache[instance.Endpoint] = instanceSet;
}
instanceSet.Add(instance);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public void AddOrReplacePublishers(string sourceKey, IList<PublisherTableEntry>
{
if (!newRouteTable.TryGetValue(entry.EventType, out var publishersOfThisEvent))
{
publishersOfThisEvent = new HashSet<PublisherAddress>();
publishersOfThisEvent = [];
newRouteTable[entry.EventType] = publishersOfThisEvent;
}
publishersOfThisEvent.Add(entry.Address);
Expand Down
2 changes: 1 addition & 1 deletion src/NServiceBus.Core/Routing/UnicastPublishRouter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ Dictionary<string, UnicastRoutingStrategy>.ValueCollection SelectDestinationsFor
}
else
{
groups[subscriber.Endpoint] = new List<string> { subscriber.TransportAddress };
groups[subscriber.Endpoint] = [subscriber.TransportAddress];
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/NServiceBus.Core/Sagas/SagaMetadata.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@ public SagaMetadata(string name, Type sagaType, string entityName, Type sagaEnti
}
}

associatedMessages = new Dictionary<string, SagaMessage>();
associatedMessages = [];

foreach (var sagaMessage in messages)
{
associatedMessages[sagaMessage.MessageTypeName] = sagaMessage;
}

sagaFinders = new Dictionary<string, SagaFinderDefinition>();
sagaFinders = [];

foreach (var finder in finders)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public static List<Tuple<SerializationDefinition, SettingsHolder>> GetAdditional
{
if (!settings.TryGet(AdditionalSerializersSettingsKey, out List<Tuple<SerializationDefinition, SettingsHolder>> deserializers))
{
deserializers = new List<Tuple<SerializationDefinition, SettingsHolder>>();
deserializers = [];
settings.Set(AdditionalSerializersSettingsKey, deserializers);
}
return deserializers;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public static void AddHeaderToAllOutgoingMessages(this EndpointConfiguration con

if (!config.Settings.TryGet(out CurrentStaticHeaders headers))
{
headers = new CurrentStaticHeaders();
headers = [];

config.Settings.Set(headers);
}
Expand Down
2 changes: 1 addition & 1 deletion src/NServiceBus.TransportTests/NServiceBusTransportTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public void SetUp()
configurer = null;
testCancellationTokenSource = Debugger.IsAttached ? new CancellationTokenSource() : new CancellationTokenSource(TestTimeout);
receiver = null;
registrations = new List<CancellationTokenRegistration>();
registrations = [];
}
protected static IConfigureTransportInfrastructure CreateConfigurer()
{
Expand Down