diff --git a/src/AWS/Orleans.Clustering.DynamoDB/Membership/DynamoDBMembershipTable.cs b/src/AWS/Orleans.Clustering.DynamoDB/Membership/DynamoDBMembershipTable.cs index a6fc09b27c..1575b3286c 100644 --- a/src/AWS/Orleans.Clustering.DynamoDB/Membership/DynamoDBMembershipTable.cs +++ b/src/AWS/Orleans.Clustering.DynamoDB/Membership/DynamoDBMembershipTable.cs @@ -481,7 +481,7 @@ private MembershipTableData Convert(List entries) } } - private MembershipEntry Parse(SiloInstanceRecord tableEntry) + private static MembershipEntry Parse(SiloInstanceRecord tableEntry) { var parse = new MembershipEntry { diff --git a/src/AdoNet/Shared/Storage/OracleDatabaseCommandInterceptor.cs b/src/AdoNet/Shared/Storage/OracleDatabaseCommandInterceptor.cs index 913ff6b349..11ded083eb 100644 --- a/src/AdoNet/Shared/Storage/OracleDatabaseCommandInterceptor.cs +++ b/src/AdoNet/Shared/Storage/OracleDatabaseCommandInterceptor.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Data; using System.Linq.Expressions; @@ -59,7 +59,7 @@ private Action BuildSetBindByNameAction() /// /// String value of a OracleDbType enum value. /// An action which takes a OracleParameter as IDbDataParameter. - private Action BuildSetOracleDbTypeAction(string enumName) + private static Action BuildSetOracleDbTypeAction(string enumName) { var type = Type.GetType("Oracle.ManagedDataAccess.Client.OracleParameter, Oracle.ManagedDataAccess"); diff --git a/src/Azure/Orleans.Streaming.AzureStorage/Storage/AzureQueueDataManager.cs b/src/Azure/Orleans.Streaming.AzureStorage/Storage/AzureQueueDataManager.cs index 85379133f9..5130e1c34d 100644 --- a/src/Azure/Orleans.Streaming.AzureStorage/Storage/AzureQueueDataManager.cs +++ b/src/Azure/Orleans.Streaming.AzureStorage/Storage/AzureQueueDataManager.cs @@ -388,7 +388,7 @@ private async Task GetCloudQueueClient(AzureQueueOptions options, I } } - private string SanitizeQueueName(string queueName) + private static string SanitizeQueueName(string queueName) { var tmp = queueName; //Azure queue naming rules : https://docs.microsoft.com/en-us/rest/api/storageservices/Naming-Queues-and-Metadata?redirectedfrom=MSDN @@ -406,7 +406,7 @@ private string SanitizeQueueName(string queueName) return tmp; } - private void ValidateQueueName(string queueName) + private static void ValidateQueueName(string queueName) { // Naming Queues and Metadata: http://msdn.microsoft.com/en-us/library/windowsazure/dd179349.aspx if (!(queueName.Length >= 3 && queueName.Length <= 63)) diff --git a/src/Azure/Orleans.Streaming.EventHubs/Providers/EventDataGeneratorStreamProvider/EventHubPartitionDataGenerator.cs b/src/Azure/Orleans.Streaming.EventHubs/Providers/EventDataGeneratorStreamProvider/EventHubPartitionDataGenerator.cs index 4c8fc9dee2..1f94b7d95a 100644 --- a/src/Azure/Orleans.Streaming.EventHubs/Providers/EventDataGeneratorStreamProvider/EventHubPartitionDataGenerator.cs +++ b/src/Azure/Orleans.Streaming.EventHubs/Providers/EventDataGeneratorStreamProvider/EventHubPartitionDataGenerator.cs @@ -53,7 +53,7 @@ public bool TryReadEvents(int maxCount, out IEnumerable events) var eventData = EventHubBatchContainer.ToEventData( this.serializer, this.StreamId, - this.GenerateEvent(this.SequenceNumberCounter.Value), + GenerateEvent(this.SequenceNumberCounter.Value), RequestContextExtensions.Export(this.deepCopier)); var wrapper = new WrappedEventData( @@ -73,13 +73,13 @@ public bool TryReadEvents(int maxCount, out IEnumerable events) return eventDataList.Count > 0; } - private IEnumerable GenerateEvent(int sequenceNumber) + private static IEnumerable GenerateEvent(int sequenceNumber) { var events = new List(); events.Add(sequenceNumber); return events; } - + public static Func> CreateFactory(IServiceProvider services) { return (streamId) => ActivatorUtilities.CreateInstance(services, streamId); diff --git a/src/Azure/Orleans.Streaming.EventHubs/Providers/Streams/EventHub/EventHubStreamOptions.cs b/src/Azure/Orleans.Streaming.EventHubs/Providers/Streams/EventHub/EventHubStreamOptions.cs index f9b5f89ec7..e2b2643135 100644 --- a/src/Azure/Orleans.Streaming.EventHubs/Providers/Streams/EventHub/EventHubStreamOptions.cs +++ b/src/Azure/Orleans.Streaming.EventHubs/Providers/Streams/EventHub/EventHubStreamOptions.cs @@ -147,7 +147,7 @@ public void ConfigureEventHubConnection(CreateConnectionDelegate createConnectio CreateConnection = createConnection ?? throw new ArgumentNullException(nameof(createConnection)); } - private void ValidateValues(string eventHubName, string consumerGroup) + private static void ValidateValues(string eventHubName, string consumerGroup) { if (string.IsNullOrWhiteSpace(eventHubName)) { diff --git a/src/Azure/Orleans.Transactions.AzureStorage/TransactionalState/StateEntity.cs b/src/Azure/Orleans.Transactions.AzureStorage/TransactionalState/StateEntity.cs index f912cb5d10..6b8cc9c04e 100644 --- a/src/Azure/Orleans.Transactions.AzureStorage/TransactionalState/StateEntity.cs +++ b/src/Azure/Orleans.Transactions.AzureStorage/TransactionalState/StateEntity.cs @@ -89,7 +89,7 @@ public void SetState(T state, JsonSerializerSettings jsonSettings) private void SetStateInternal(string stringData) { - this.CheckMaxDataSize((stringData ?? string.Empty).Length * 2, MAX_DATA_CHUNK_SIZE * MAX_DATA_CHUNKS_COUNT); + CheckMaxDataSize((stringData ?? string.Empty).Length * 2, MAX_DATA_CHUNK_SIZE * MAX_DATA_CHUNKS_COUNT); foreach (var key in StringDataPropertyNames) { @@ -146,7 +146,7 @@ private object GetPropertyOrDefault(string key) return result; } - private void CheckMaxDataSize(int dataSize, int maxDataSize) + private static void CheckMaxDataSize(int dataSize, int maxDataSize) { if (dataSize > maxDataSize) { diff --git a/src/Orleans.BroadcastChannel/SubscriberTable/ImplicitChannelSubscriberTable.cs b/src/Orleans.BroadcastChannel/SubscriberTable/ImplicitChannelSubscriberTable.cs index 2c11531d2a..3bd95637b6 100644 --- a/src/Orleans.BroadcastChannel/SubscriberTable/ImplicitChannelSubscriberTable.cs +++ b/src/Orleans.BroadcastChannel/SubscriberTable/ImplicitChannelSubscriberTable.cs @@ -181,7 +181,7 @@ private static HashSet FindImplicitSubscribers(strin /// The channel ID to use for the grain ID construction. /// The GrainBindings for the grain to create /// - private IBroadcastChannelConsumerExtension MakeConsumerReference( + private static IBroadcastChannelConsumerExtension MakeConsumerReference( IGrainFactory grainFactory, InternalChannelId channelId, BroadcastChannelSubscriber channelSubscriber) diff --git a/src/Orleans.CodeGenerator/CodeGenerator.cs b/src/Orleans.CodeGenerator/CodeGenerator.cs index 12b023084c..faf2cd5ab3 100644 --- a/src/Orleans.CodeGenerator/CodeGenerator.cs +++ b/src/Orleans.CodeGenerator/CodeGenerator.cs @@ -460,7 +460,7 @@ void ComputeAssembliesToExamine(IAssemblySymbol asm, HashSet ex } // Returns descriptions of all data members (fields and properties) - private IEnumerable GetDataMembers(FieldIdAssignmentHelper fieldIdAssignmentHelper) + private static IEnumerable GetDataMembers(FieldIdAssignmentHelper fieldIdAssignmentHelper) { var members = new Dictionary<(uint, bool), IMemberDescription>(); diff --git a/src/Orleans.CodeGenerator/FieldIdAssignmentHelper.cs b/src/Orleans.CodeGenerator/FieldIdAssignmentHelper.cs index 71c30724b3..6d6ba33be9 100644 --- a/src/Orleans.CodeGenerator/FieldIdAssignmentHelper.cs +++ b/src/Orleans.CodeGenerator/FieldIdAssignmentHelper.cs @@ -110,7 +110,7 @@ private bool ExtractFieldIdAnnotations() return true; } - private (string, uint) GetCanonicalNameAndFieldId(ITypeSymbol typeSymbol, string name) + private static (string, uint) GetCanonicalNameAndFieldId(ITypeSymbol typeSymbol, string name) { name = PropertyUtility.GetCanonicalName(name); diff --git a/src/Orleans.Core/Async/AsyncSerialExecutor.cs b/src/Orleans.Core/Async/AsyncSerialExecutor.cs index 32519c667c..22dd7831a9 100644 --- a/src/Orleans.Core/Async/AsyncSerialExecutor.cs +++ b/src/Orleans.Core/Async/AsyncSerialExecutor.cs @@ -124,7 +124,7 @@ public Task AddNext(Func func) return this.executor.AddNext(() => Wrap(func)); } - private async Task Wrap(Func func) + private static async Task Wrap(Func func) { await func(); return true; diff --git a/src/Orleans.Core/Manifest/GrainBindings.cs b/src/Orleans.Core/Manifest/GrainBindings.cs index f6e59b92b2..24b449e0ff 100644 --- a/src/Orleans.Core/Manifest/GrainBindings.cs +++ b/src/Orleans.Core/Manifest/GrainBindings.cs @@ -123,7 +123,7 @@ private Cache GetCache() } } - private Cache BuildCache(ClusterManifest clusterManifest) + private static Cache BuildCache(ClusterManifest clusterManifest) { var result = new Dictionary(); diff --git a/src/Orleans.Hosting.Kubernetes/ConfigureKubernetesHostingOptions.cs b/src/Orleans.Hosting.Kubernetes/ConfigureKubernetesHostingOptions.cs index fd540d2473..ad574ad178 100644 --- a/src/Orleans.Hosting.Kubernetes/ConfigureKubernetesHostingOptions.cs +++ b/src/Orleans.Hosting.Kubernetes/ConfigureKubernetesHostingOptions.cs @@ -94,7 +94,7 @@ public void PostConfigure(string? name, EndpointOptions options) } } - private string? ReadNamespaceFromServiceAccount() + private static string? ReadNamespaceFromServiceAccount() { // Read the namespace from the pod's service account. var serviceAccountNamespacePath = Path.Combine($"{Path.DirectorySeparatorChar}var", "run", "secrets", "kubernetes.io", "serviceaccount", "namespace"); diff --git a/src/Orleans.Runtime/Catalog/GrainTypeSharedContext.cs b/src/Orleans.Runtime/Catalog/GrainTypeSharedContext.cs index d7ec0f4d2b..231a6fa606 100644 --- a/src/Orleans.Runtime/Catalog/GrainTypeSharedContext.cs +++ b/src/Orleans.Runtime/Catalog/GrainTypeSharedContext.cs @@ -67,7 +67,7 @@ public GrainTypeSharedContext( /// public string? GrainTypeName { get; } - private TimeSpan GetCollectionAgeLimit(GrainType grainType, Type grainClass, GrainManifest siloManifest, GrainCollectionOptions collectionOptions) + private static TimeSpan GetCollectionAgeLimit(GrainType grainType, Type grainClass, GrainManifest siloManifest, GrainCollectionOptions collectionOptions) { if (siloManifest.Grains.TryGetValue(grainType, out var properties) && properties.Properties.TryGetValue(WellKnownGrainTypeProperties.IdleDeactivationPeriod, out var idleTimeoutString)) diff --git a/src/Orleans.Runtime/Core/ManagementGrain.cs b/src/Orleans.Runtime/Core/ManagementGrain.cs index ba1f12cd8c..75779daee3 100644 --- a/src/Orleans.Runtime/Core/ManagementGrain.cs +++ b/src/Orleans.Runtime/Core/ManagementGrain.cs @@ -338,7 +338,7 @@ private SiloAddress[] GetSiloAddresses(SiloAddress[] silos) /// List of silos to perform the action for /// The action function to be performed for each silo /// Array containing one Task for each silo the action was performed for - private List PerformPerSiloAction(SiloAddress[] siloAddresses, Func perSiloAction) + private static List PerformPerSiloAction(SiloAddress[] siloAddresses, Func perSiloAction) { var requestsToSilos = new List(); foreach (SiloAddress siloAddress in siloAddresses) diff --git a/src/Orleans.Runtime/Hosting/SiloHostedService.cs b/src/Orleans.Runtime/Hosting/SiloHostedService.cs index 9efbd7c48d..e2e4b9fe7f 100644 --- a/src/Orleans.Runtime/Hosting/SiloHostedService.cs +++ b/src/Orleans.Runtime/Hosting/SiloHostedService.cs @@ -17,7 +17,7 @@ public SiloHostedService( IEnumerable configurationValidators, ILogger logger) { - this.ValidateSystemConfiguration(configurationValidators); + ValidateSystemConfiguration(configurationValidators); this.silo = silo; this.logger = logger; } @@ -36,7 +36,7 @@ public async Task StopAsync(CancellationToken cancellationToken) this.logger.LogInformation("Orleans Silo stopped."); } - private void ValidateSystemConfiguration(IEnumerable configurationValidators) + private static void ValidateSystemConfiguration(IEnumerable configurationValidators) { foreach (var validator in configurationValidators) { diff --git a/src/Orleans.Runtime/MembershipService/MembershipTableManager.cs b/src/Orleans.Runtime/MembershipService/MembershipTableManager.cs index e3c18d39ef..a4e597d82c 100644 --- a/src/Orleans.Runtime/MembershipService/MembershipTableManager.cs +++ b/src/Orleans.Runtime/MembershipService/MembershipTableManager.cs @@ -287,14 +287,14 @@ private async Task PeriodicallyRefreshMembershipTable() } } - private Task MembershipExecuteWithRetries( + private static Task MembershipExecuteWithRetries( Func> taskFunction, TimeSpan timeout) { return MembershipExecuteWithRetries(taskFunction, timeout, (result, i) => result == false); } - private Task MembershipExecuteWithRetries( + private static Task MembershipExecuteWithRetries( Func> taskFunction, TimeSpan timeout, Func retryValueFilter) @@ -303,8 +303,8 @@ private Task MembershipExecuteWithRetries( taskFunction, NUM_CONDITIONAL_WRITE_CONTENTION_ATTEMPTS, NUM_CONDITIONAL_WRITE_ERROR_ATTEMPTS, - retryValueFilter, // if failed to Update on contention - retry - (exc, i) => true, // Retry on errors. + retryValueFilter, // if failed to Update on contention - retry + (exc, i) => true, // Retry on errors. timeout, new ExponentialBackoff(EXP_BACKOFF_CONTENTION_MIN, EXP_BACKOFF_CONTENTION_MAX, EXP_BACKOFF_STEP), // how long to wait between successful retries new ExponentialBackoff(EXP_BACKOFF_ERROR_MIN, EXP_BACKOFF_ERROR_MAX, EXP_BACKOFF_STEP) // how long to wait between error retries diff --git a/src/Orleans.Serialization/Codecs/ArrayCodec.cs b/src/Orleans.Serialization/Codecs/ArrayCodec.cs index 21277774c1..0d844964a1 100644 --- a/src/Orleans.Serialization/Codecs/ArrayCodec.cs +++ b/src/Orleans.Serialization/Codecs/ArrayCodec.cs @@ -116,13 +116,13 @@ public T[] ReadValue(ref Reader reader, Field field) return result; } - private void ThrowIndexOutOfRangeException(int length) => throw new IndexOutOfRangeException( + private static void ThrowIndexOutOfRangeException(int length) => throw new IndexOutOfRangeException( $"Encountered too many elements in array of type {typeof(T[])} with declared length {length}."); - private void ThrowInvalidSizeException(int length) => throw new IndexOutOfRangeException( + private static void ThrowInvalidSizeException(int length) => throw new IndexOutOfRangeException( $"Declared length of {typeof(T[])}, {length}, is greater than total length of input."); - private void ThrowLengthFieldMissing() => throw new RequiredFieldMissingException("Serialized array is missing its length field."); + private static void ThrowLengthFieldMissing() => throw new RequiredFieldMissingException("Serialized array is missing its length field."); } /// @@ -266,12 +266,12 @@ public ReadOnlyMemory ReadValue(ref Reader reader, Field fiel return result; } - private void ThrowIndexOutOfRangeException(int length) => throw new IndexOutOfRangeException( + private static void ThrowIndexOutOfRangeException(int length) => throw new IndexOutOfRangeException( $"Encountered too many elements in array of type {typeof(T[])} with declared length {length}."); - private void ThrowLengthFieldMissing() => throw new RequiredFieldMissingException("Serialized array is missing its length field."); + private static void ThrowLengthFieldMissing() => throw new RequiredFieldMissingException("Serialized array is missing its length field."); - private void ThrowInvalidSizeException(int length) => throw new IndexOutOfRangeException( + private static void ThrowInvalidSizeException(int length) => throw new IndexOutOfRangeException( $"Declared length of {typeof(ReadOnlyMemory)}, {length}, is greater than total length of input."); } @@ -428,12 +428,12 @@ public Memory ReadValue(ref Reader reader, Field field) return result; } - private void ThrowIndexOutOfRangeException(int length) => throw new IndexOutOfRangeException( + private static void ThrowIndexOutOfRangeException(int length) => throw new IndexOutOfRangeException( $"Encountered too many elements in array of type {typeof(T[])} with declared length {length}."); - private void ThrowLengthFieldMissing() => throw new RequiredFieldMissingException("Serialized array is missing its length field."); + private static void ThrowLengthFieldMissing() => throw new RequiredFieldMissingException("Serialized array is missing its length field."); - private void ThrowInvalidSizeException(int length) => throw new IndexOutOfRangeException( + private static void ThrowInvalidSizeException(int length) => throw new IndexOutOfRangeException( $"Declared length of {typeof(Memory)}, {length}, is greater than total length of input."); } @@ -593,12 +593,12 @@ public ArraySegment ReadValue(ref Reader reader, Field field) return result; } - private void ThrowIndexOutOfRangeException(int length) => throw new IndexOutOfRangeException( + private static void ThrowIndexOutOfRangeException(int length) => throw new IndexOutOfRangeException( $"Encountered too many elements in array of type {typeof(T[])} with declared length {length}."); - private void ThrowLengthFieldMissing() => throw new RequiredFieldMissingException("Serialized array is missing its length field."); + private static void ThrowLengthFieldMissing() => throw new RequiredFieldMissingException("Serialized array is missing its length field."); - private void ThrowInvalidSizeException(int length) => throw new IndexOutOfRangeException( + private static void ThrowInvalidSizeException(int length) => throw new IndexOutOfRangeException( $"Declared length of {typeof(ArraySegment)}, {length}, is greater than total length of input."); } diff --git a/src/Orleans.Serialization/Codecs/CollectionCodec.cs b/src/Orleans.Serialization/Codecs/CollectionCodec.cs index 0e7207034c..5757f966c5 100644 --- a/src/Orleans.Serialization/Codecs/CollectionCodec.cs +++ b/src/Orleans.Serialization/Codecs/CollectionCodec.cs @@ -112,10 +112,10 @@ public Collection ReadValue(ref Reader reader, Field field) return result; } - private void ThrowInvalidSizeException(int length) => throw new IndexOutOfRangeException( + private static void ThrowInvalidSizeException(int length) => throw new IndexOutOfRangeException( $"Declared length of {typeof(Collection)}, {length}, is greater than total length of input."); - private void ThrowLengthFieldMissing() => throw new RequiredFieldMissingException("Serialized array is missing its length field."); + private static void ThrowLengthFieldMissing() => throw new RequiredFieldMissingException("Serialized array is missing its length field."); } /// diff --git a/src/Orleans.Serialization/Codecs/DictionaryCodec.cs b/src/Orleans.Serialization/Codecs/DictionaryCodec.cs index c1cceb661a..c6b6e91ddd 100644 --- a/src/Orleans.Serialization/Codecs/DictionaryCodec.cs +++ b/src/Orleans.Serialization/Codecs/DictionaryCodec.cs @@ -136,17 +136,17 @@ public Dictionary ReadValue(ref Reader reader, Fie return result; } - private Dictionary CreateInstance(int length, IEqualityComparer comparer, SerializerSession session, uint placeholderReferenceId) + private static Dictionary CreateInstance(int length, IEqualityComparer comparer, SerializerSession session, uint placeholderReferenceId) { var result = new Dictionary(length, comparer); ReferenceCodec.RecordObject(session, result, placeholderReferenceId); return result; } - private void ThrowInvalidSizeException(int length) => throw new IndexOutOfRangeException( + private static void ThrowInvalidSizeException(int length) => throw new IndexOutOfRangeException( $"Declared length of {typeof(Dictionary)}, {length}, is greater than total length of input."); - private void ThrowLengthFieldMissing() => throw new RequiredFieldMissingException("Serialized dictionary is missing its length field."); + private static void ThrowLengthFieldMissing() => throw new RequiredFieldMissingException("Serialized dictionary is missing its length field."); } /// @@ -312,10 +312,10 @@ void IBaseCodec>.Deserialize(ref Reader } } - private void ThrowInvalidSizeException(int length) => throw new IndexOutOfRangeException( + private static void ThrowInvalidSizeException(int length) => throw new IndexOutOfRangeException( $"Declared length of {typeof(Dictionary)}, {length}, is greater than total length of input."); - private void ThrowLengthFieldMissing() => throw new RequiredFieldMissingException("Serialized dictionary is missing its length field."); + private static void ThrowLengthFieldMissing() => throw new RequiredFieldMissingException("Serialized dictionary is missing its length field."); } } \ No newline at end of file diff --git a/src/Orleans.Serialization/Codecs/HashSetCodec.cs b/src/Orleans.Serialization/Codecs/HashSetCodec.cs index df7b627ebc..38eb9332b0 100644 --- a/src/Orleans.Serialization/Codecs/HashSetCodec.cs +++ b/src/Orleans.Serialization/Codecs/HashSetCodec.cs @@ -115,17 +115,17 @@ public HashSet ReadValue(ref Reader reader, Field field) return result; } - private HashSet CreateInstance(int length, IEqualityComparer comparer, SerializerSession session, uint placeholderReferenceId) + private static HashSet CreateInstance(int length, IEqualityComparer comparer, SerializerSession session, uint placeholderReferenceId) { var result = new HashSet(length, comparer); ReferenceCodec.RecordObject(session, result, placeholderReferenceId); return result; } - private void ThrowInvalidSizeException(int length) => throw new IndexOutOfRangeException( + private static void ThrowInvalidSizeException(int length) => throw new IndexOutOfRangeException( $"Declared length of {typeof(HashSet)}, {length}, is greater than total length of input."); - private void ThrowLengthFieldMissing() => throw new RequiredFieldMissingException("Serialized set is missing its length field."); + private static void ThrowLengthFieldMissing() => throw new RequiredFieldMissingException("Serialized set is missing its length field."); } /// diff --git a/src/Orleans.Serialization/Codecs/ListCodec.cs b/src/Orleans.Serialization/Codecs/ListCodec.cs index b0a37c9762..89707f6c85 100644 --- a/src/Orleans.Serialization/Codecs/ListCodec.cs +++ b/src/Orleans.Serialization/Codecs/ListCodec.cs @@ -111,10 +111,10 @@ public List ReadValue(ref Reader reader, Field field) return result; } - private void ThrowInvalidSizeException(int length) => throw new IndexOutOfRangeException( + private static void ThrowInvalidSizeException(int length) => throw new IndexOutOfRangeException( $"Declared length of {typeof(List)}, {length}, is greater than total length of input."); - private void ThrowLengthFieldMissing() => throw new RequiredFieldMissingException("Serialized array is missing its length field."); + private static void ThrowLengthFieldMissing() => throw new RequiredFieldMissingException("Serialized array is missing its length field."); } /// diff --git a/src/Orleans.Serialization/Codecs/MultiDimensionalArrayCodec.cs b/src/Orleans.Serialization/Codecs/MultiDimensionalArrayCodec.cs index c1db4238be..524910f1ed 100644 --- a/src/Orleans.Serialization/Codecs/MultiDimensionalArrayCodec.cs +++ b/src/Orleans.Serialization/Codecs/MultiDimensionalArrayCodec.cs @@ -156,7 +156,7 @@ public object ReadValue(ref Reader reader, Field field) private void ThrowIndexOutOfRangeException(int[] lengths) => throw new IndexOutOfRangeException( $"Encountered too many elements in array of type {CodecElementType} with declared lengths {string.Join(", ", lengths)}."); - private void ThrowLengthsFieldMissing() => throw new RequiredFieldMissingException("Serialized array is missing its lengths field."); + private static void ThrowLengthsFieldMissing() => throw new RequiredFieldMissingException("Serialized array is missing its lengths field."); } /// diff --git a/src/Orleans.Serialization/Codecs/NullableCodec.cs b/src/Orleans.Serialization/Codecs/NullableCodec.cs index dde1c85f8c..5a4e726588 100644 --- a/src/Orleans.Serialization/Codecs/NullableCodec.cs +++ b/src/Orleans.Serialization/Codecs/NullableCodec.cs @@ -59,7 +59,7 @@ public void WriteField(ref Writer writer, uint fie return _fieldCodec.ReadValue(ref reader, field); } - private void ThrowInvalidReference(uint reference) => throw new ReferenceNotFoundException(typeof(T?), reference); + private static void ThrowInvalidReference(uint reference) => throw new ReferenceNotFoundException(typeof(T?), reference); } /// diff --git a/src/Orleans.Serialization/Codecs/QueueCodec.cs b/src/Orleans.Serialization/Codecs/QueueCodec.cs index 6a576092a5..d801050d48 100644 --- a/src/Orleans.Serialization/Codecs/QueueCodec.cs +++ b/src/Orleans.Serialization/Codecs/QueueCodec.cs @@ -103,7 +103,7 @@ public Queue ReadValue(ref Reader reader, Field field) return result; } - private void ThrowLengthFieldMissing() => throw new RequiredFieldMissingException("Serialized queue is missing its length field."); + private static void ThrowLengthFieldMissing() => throw new RequiredFieldMissingException("Serialized queue is missing its length field."); } /// diff --git a/src/Orleans.Serialization/Codecs/StackCodec.cs b/src/Orleans.Serialization/Codecs/StackCodec.cs index 75d9c5545d..f51d8f21fa 100644 --- a/src/Orleans.Serialization/Codecs/StackCodec.cs +++ b/src/Orleans.Serialization/Codecs/StackCodec.cs @@ -111,10 +111,10 @@ public Stack ReadValue(ref Reader reader, Field field) return result; } - private void ThrowInvalidSizeException(int length) => throw new IndexOutOfRangeException( + private static void ThrowInvalidSizeException(int length) => throw new IndexOutOfRangeException( $"Declared length of {typeof(Stack)}, {length}, is greater than total length of input."); - private void ThrowLengthFieldMissing() => throw new RequiredFieldMissingException("Serialized stack is missing its length field."); + private static void ThrowLengthFieldMissing() => throw new RequiredFieldMissingException("Serialized stack is missing its length field."); } /// diff --git a/src/Orleans.Streaming/Generator/GeneratorPooledCache.cs b/src/Orleans.Streaming/Generator/GeneratorPooledCache.cs index 6f31b0f576..7ad20809fa 100644 --- a/src/Orleans.Streaming/Generator/GeneratorPooledCache.cs +++ b/src/Orleans.Streaming/Generator/GeneratorPooledCache.cs @@ -99,7 +99,7 @@ private ArraySegment SerializeMessageIntoPooledSegment(GeneratedBatchConta return segment; } - private StreamPosition GetStreamPosition(GeneratedBatchContainer queueMessage) + private static StreamPosition GetStreamPosition(GeneratedBatchContainer queueMessage) { return new StreamPosition(queueMessage.StreamId, queueMessage.RealToken); } diff --git a/src/Orleans.Streaming/MemoryStreams/MemoryPooledCache.cs b/src/Orleans.Streaming/MemoryStreams/MemoryPooledCache.cs index c61e0489d7..ad419a625c 100644 --- a/src/Orleans.Streaming/MemoryStreams/MemoryPooledCache.cs +++ b/src/Orleans.Streaming/MemoryStreams/MemoryPooledCache.cs @@ -88,7 +88,7 @@ private ArraySegment SerializeMessageIntoPooledSegment(MemoryMessageData q return segment; } - private StreamPosition GetStreamPosition(MemoryMessageData queueMessage) + private static StreamPosition GetStreamPosition(MemoryMessageData queueMessage) { return new StreamPosition(queueMessage.StreamId, new EventSequenceTokenV2(queueMessage.SequenceNumber)); diff --git a/src/Orleans.Streaming/PersistentStreams/PersistentStreamPullingAgent.cs b/src/Orleans.Streaming/PersistentStreams/PersistentStreamPullingAgent.cs index 27b10423c7..2d5bdb6381 100644 --- a/src/Orleans.Streaming/PersistentStreams/PersistentStreamPullingAgent.cs +++ b/src/Orleans.Streaming/PersistentStreams/PersistentStreamPullingAgent.cs @@ -722,7 +722,7 @@ private async Task DeliverBatchToConsumer(StreamConsumerDa /// /// Add call context for batch delivery call, then clear context immediately, without giving up turn. /// - private Task ContextualizedDeliverBatchToConsumer(StreamConsumerData consumerData, IBatchContainer batch) + private static Task ContextualizedDeliverBatchToConsumer(StreamConsumerData consumerData, IBatchContainer batch) { bool isRequestContextSet = batch.ImportRequestContext(); try diff --git a/src/Orleans.Streaming/PubSub/ImplicitStreamPubSub.cs b/src/Orleans.Streaming/PubSub/ImplicitStreamPubSub.cs index 0bb5c0b71f..757df0667d 100644 --- a/src/Orleans.Streaming/PubSub/ImplicitStreamPubSub.cs +++ b/src/Orleans.Streaming/PubSub/ImplicitStreamPubSub.cs @@ -92,7 +92,7 @@ public Task> GetAllSubscriptions(QualifiedStreamId stre return new StreamSubscription(subId, streamId.ProviderName, streamId, grainId); }).ToList(); return Task.FromResult(subscriptions); - } + } } internal bool IsImplicitSubscriber(GrainId grainId, QualifiedStreamId streamId) diff --git a/src/Orleans.TestingHost/InProcessSiloHandle.cs b/src/Orleans.TestingHost/InProcessSiloHandle.cs index 2796c2bf6e..c585db632a 100644 --- a/src/Orleans.TestingHost/InProcessSiloHandle.cs +++ b/src/Orleans.TestingHost/InProcessSiloHandle.cs @@ -121,7 +121,7 @@ public override async ValueTask DisposeAsync() } } - private void WriteLog(object value) + private static void WriteLog(object value) { Console.WriteLine(value?.ToString()); } diff --git a/src/Orleans.Transactions.TestKit.Base/FaultInjection/ControlledInjection/FaultInjectionTransactionStateAttribute.cs b/src/Orleans.Transactions.TestKit.Base/FaultInjection/ControlledInjection/FaultInjectionTransactionStateAttribute.cs index 43d5c9b91b..3ac0250b19 100644 --- a/src/Orleans.Transactions.TestKit.Base/FaultInjection/ControlledInjection/FaultInjectionTransactionStateAttribute.cs +++ b/src/Orleans.Transactions.TestKit.Base/FaultInjection/ControlledInjection/FaultInjectionTransactionStateAttribute.cs @@ -59,7 +59,7 @@ public Factory GetFactory(ParameterInfo parameter, FaultI return context => Create(context, genericCreate, args); } - private object Create(IGrainContext context, MethodInfo genericCreate, object[] args) + private static object Create(IGrainContext context, MethodInfo genericCreate, object[] args) { IFaultInjectionTransactionalStateFactory factory = context.ActivationServices.GetRequiredService(); return genericCreate.Invoke(factory, args); diff --git a/src/Orleans.Transactions.TestKit.Base/TestRunners/GrainFaultTransactionTestRunner.cs b/src/Orleans.Transactions.TestKit.Base/TestRunners/GrainFaultTransactionTestRunner.cs index 9da7aac226..2fb18a1fd9 100644 --- a/src/Orleans.Transactions.TestKit.Base/TestRunners/GrainFaultTransactionTestRunner.cs +++ b/src/Orleans.Transactions.TestKit.Base/TestRunners/GrainFaultTransactionTestRunner.cs @@ -139,7 +139,7 @@ await TestAfterDustSettles(async () => }); } - private async Task TestAfterDustSettles(Func what) + private static async Task TestAfterDustSettles(Func what) { int tries = 2; while (tries-- > 0) diff --git a/src/Orleans.Transactions.TestKit.Base/TestRunners/TransactionRecoveryTestsRunner.cs b/src/Orleans.Transactions.TestKit.Base/TestRunners/TransactionRecoveryTestsRunner.cs index 7708199b9d..e26e6c8186 100644 --- a/src/Orleans.Transactions.TestKit.Base/TestRunners/TransactionRecoveryTestsRunner.cs +++ b/src/Orleans.Transactions.TestKit.Base/TestRunners/TransactionRecoveryTestsRunner.cs @@ -115,7 +115,7 @@ protected virtual async Task TransactionWillRecoverAfterRandomSiloFailure(string await ValidateResults(txGrains, transactionGroups); } - private Task WakeupGrains(List grains) + private static Task WakeupGrains(List grains) { var tasks = new List(); foreach (var grain in grains) diff --git a/src/Orleans.Transactions.TestKit.Base/TestRunners/TransactionalStateStorageTestRunner.cs b/src/Orleans.Transactions.TestKit.Base/TestRunners/TransactionalStateStorageTestRunner.cs index 8094f4d355..d18713059b 100644 --- a/src/Orleans.Transactions.TestKit.Base/TestRunners/TransactionalStateStorageTestRunner.cs +++ b/src/Orleans.Transactions.TestKit.Base/TestRunners/TransactionalStateStorageTestRunner.cs @@ -147,7 +147,7 @@ private void AssertTState(TState actual, TState expected) actual.Should().BeEquivalentTo(expected, assertConfig); } - private PendingTransactionState MakePendingState(long seqno, TState val, bool tm) + private static PendingTransactionState MakePendingState(long seqno, TState val, bool tm) { var result = new PendingTransactionState() { @@ -161,7 +161,7 @@ private PendingTransactionState MakePendingState(long seqno, TState val, return result; } - private ParticipantId MakeParticipantId() + private static ParticipantId MakeParticipantId() { return new ParticipantId( "tm", @@ -170,7 +170,7 @@ private ParticipantId MakeParticipantId() ParticipantId.Role.Resource | ParticipantId.Role.Manager); } - private Dictionary MakeCommitRecords(int count, int size) + private static Dictionary MakeCommitRecords(int count, int size) { var result = new Dictionary(); for (int j = 0; j < size; j++) diff --git a/src/Orleans.Transactions/Hosting/TransactionCommitterAttributeMapper.cs b/src/Orleans.Transactions/Hosting/TransactionCommitterAttributeMapper.cs index 67400c158c..b84a78e839 100644 --- a/src/Orleans.Transactions/Hosting/TransactionCommitterAttributeMapper.cs +++ b/src/Orleans.Transactions/Hosting/TransactionCommitterAttributeMapper.cs @@ -1,4 +1,4 @@ -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using Orleans.Runtime; using Orleans.Transactions.Abstractions; using System.Reflection; @@ -18,7 +18,7 @@ public Factory GetFactory(ParameterInfo parameter, Transa return context => Create(context, genericCreate, args); } - private object Create(IGrainContext context, MethodInfo genericCreate, object[] args) + private static object Create(IGrainContext context, MethodInfo genericCreate, object[] args) { ITransactionCommitterFactory factory = context.ActivationServices.GetRequiredService(); return genericCreate.Invoke(factory, args); diff --git a/src/Orleans.Transactions/State/ReaderWriterLock.cs b/src/Orleans.Transactions/State/ReaderWriterLock.cs index cd83817a73..f46a765e46 100644 --- a/src/Orleans.Transactions/State/ReaderWriterLock.cs +++ b/src/Orleans.Transactions/State/ReaderWriterLock.cs @@ -420,7 +420,7 @@ record = null; } } - private bool HasConflict(bool isRead, DateTime priority, Guid transactionId, LockGroup group, out bool resolvable) + private static bool HasConflict(bool isRead, DateTime priority, Guid transactionId, LockGroup group, out bool resolvable) { bool foundResolvableConflicts = false; @@ -451,7 +451,7 @@ private bool HasConflict(bool isRead, DateTime priority, Guid transactionId, Loc return foundResolvableConflicts; } - private IEnumerable Conflicts(Guid transactionId, LockGroup group) + private static IEnumerable Conflicts(Guid transactionId, LockGroup group) { foreach (var kvp in group) { diff --git a/test/Benchmarks/Serialization/Comparison/ClassDeserializeBenchmark.cs b/test/Benchmarks/Serialization/Comparison/ClassDeserializeBenchmark.cs index d954e86ea2..ac741b8162 100644 --- a/test/Benchmarks/Serialization/Comparison/ClassDeserializeBenchmark.cs +++ b/test/Benchmarks/Serialization/Comparison/ClassDeserializeBenchmark.cs @@ -107,7 +107,7 @@ public int Orleans() var instance = Serializer.Deserialize(Input, Session); return SumResult(instance); } - + [Benchmark] public int Utf8Json() => SumResult(Utf8JsonNS.JsonSerializer.Deserialize(Utf8JsonInput, Utf8JsonResolver)); diff --git a/test/Extensions/AWSUtils.Tests/StorageTests/PersistenceGrainTests_AWSDynamoDBStore.cs b/test/Extensions/AWSUtils.Tests/StorageTests/PersistenceGrainTests_AWSDynamoDBStore.cs index 4f96e500af..133b403455 100644 --- a/test/Extensions/AWSUtils.Tests/StorageTests/PersistenceGrainTests_AWSDynamoDBStore.cs +++ b/test/Extensions/AWSUtils.Tests/StorageTests/PersistenceGrainTests_AWSDynamoDBStore.cs @@ -180,7 +180,7 @@ await InitDynamoDBTableStorageProvider( Assert.Equal(initialState.Grain, convertedState.Grain); // "Grain" } - private async Task InitDynamoDBTableStorageProvider(IProviderRuntime runtime, string storageName) + private static async Task InitDynamoDBTableStorageProvider(IProviderRuntime runtime, string storageName) { var options = new DynamoDBStorageOptions(); options.Service = AWSTestConstants.DynamoDbService; diff --git a/test/Extensions/AWSUtils.Tests/Streaming/SQSAdapterTests.cs b/test/Extensions/AWSUtils.Tests/Streaming/SQSAdapterTests.cs index e2ae6ed800..8aed58cc6f 100644 --- a/test/Extensions/AWSUtils.Tests/Streaming/SQSAdapterTests.cs +++ b/test/Extensions/AWSUtils.Tests/Streaming/SQSAdapterTests.cs @@ -184,7 +184,7 @@ private async Task SendAndReceiveFromQueueAdapter(IQueueAdapterFactory adapterFa } } - private List CreateEvents(int count) + private static List CreateEvents(int count) { return Enumerable.Range(0, count).Select(i => { diff --git a/test/Extensions/ServiceBus.Tests/EvictionStrategyTests/EHPurgeLogicTests.cs b/test/Extensions/ServiceBus.Tests/EvictionStrategyTests/EHPurgeLogicTests.cs index c62ca43c71..76ea9e8a98 100644 --- a/test/Extensions/ServiceBus.Tests/EvictionStrategyTests/EHPurgeLogicTests.cs +++ b/test/Extensions/ServiceBus.Tests/EvictionStrategyTests/EHPurgeLogicTests.cs @@ -222,7 +222,7 @@ private int GetItemCountInAllCache(ConcurrentBag c return itemCount; } - private async Task AddDataIntoCache(EventHubQueueCacheForTesting cache, int count) + private static async Task AddDataIntoCache(EventHubQueueCacheForTesting cache, int count) { await Task.Delay(10); List messages = Enumerable.Range(0, count) @@ -231,7 +231,7 @@ private async Task AddDataIntoCache(EventHubQueueCacheForTesting cache, int coun cache.Add(messages, DateTime.UtcNow); } - private EventData MakeEventData(long sequenceNumber) + private static EventData MakeEventData(long sequenceNumber) { byte[] ignore = { 12, 23 }; var now = DateTime.UtcNow; diff --git a/test/Extensions/ServiceBus.Tests/SlowConsumingTests/EHSlowConsumingTests.cs b/test/Extensions/ServiceBus.Tests/SlowConsumingTests/EHSlowConsumingTests.cs index 7ad481f103..79351b2157 100644 --- a/test/Extensions/ServiceBus.Tests/SlowConsumingTests/EHSlowConsumingTests.cs +++ b/test/Extensions/ServiceBus.Tests/SlowConsumingTests/EHSlowConsumingTests.cs @@ -117,7 +117,7 @@ public static async Task> SetUpHealthyConsu return grains; } - private async Task StopHealthyConsumerGrainComing(List grains) + private static async Task StopHealthyConsumerGrainComing(List grains) { List tasks = new List(); foreach (var grain in grains) diff --git a/test/Extensions/ServiceBus.Tests/StatisticMonitorTests/EHStatisticMonitorTests.cs b/test/Extensions/ServiceBus.Tests/StatisticMonitorTests/EHStatisticMonitorTests.cs index 0e5d02ee38..429c8ba0ea 100644 --- a/test/Extensions/ServiceBus.Tests/StatisticMonitorTests/EHStatisticMonitorTests.cs +++ b/test/Extensions/ServiceBus.Tests/StatisticMonitorTests/EHStatisticMonitorTests.cs @@ -113,7 +113,7 @@ await mgmtGrain.SendControlCommandToProvider(typeof(PersistentStreamProvider).Fu } } - private void AssertCacheMonitorCallCounters(CacheMonitorCounters totalCacheMonitorCallCounters) + private static void AssertCacheMonitorCallCounters(CacheMonitorCounters totalCacheMonitorCallCounters) { var c = totalCacheMonitorCallCounters; Assert.True(c.TrackCachePressureMonitorStatusChangeCallCounter > 0, @@ -124,7 +124,7 @@ private void AssertCacheMonitorCallCounters(CacheMonitorCounters totalCacheMonit Assert.True(0 == c.TrackMessagePurgedCounter, $"Expected {nameof(c.TrackMessagePurgedCounter)} == 0, got {c.TrackMessagePurgedCounter}"); } - private void AssertReceiverMonitorCallCounters(EventHubReceiverMonitorCounters totalReceiverMonitorCallCounters) + private static void AssertReceiverMonitorCallCounters(EventHubReceiverMonitorCounters totalReceiverMonitorCallCounters) { var c = totalReceiverMonitorCallCounters; Assert.True(ehPartitionCountPerSilo == c.TrackInitializationCallCounter, $"Expected {nameof(c.TrackInitializationCallCounter)} == {ehPartitionCountPerSilo}, got {c.TrackInitializationCallCounter}"); @@ -133,7 +133,7 @@ private void AssertReceiverMonitorCallCounters(EventHubReceiverMonitorCounters t Assert.True(0 == c.TrackShutdownCallCounter, $"Expected {nameof(c.TrackShutdownCallCounter)} == 0, got {c.TrackShutdownCallCounter}"); } - private void AssertObjectPoolMonitorCallCounters(ObjectPoolMonitorCounters totalObjectPoolMonitorCallCounters) + private static void AssertObjectPoolMonitorCallCounters(ObjectPoolMonitorCounters totalObjectPoolMonitorCallCounters) { var c = totalObjectPoolMonitorCallCounters; Assert.True(c.TrackObjectAllocatedByCacheCallCounter > 0, $"Expected {nameof(c.TrackObjectAllocatedByCacheCallCounter)} > 0, got {c.TrackObjectAllocatedByCacheCallCounter}"); diff --git a/test/Extensions/ServiceBus.Tests/Streaming/EHStreamPerPartitionTests.cs b/test/Extensions/ServiceBus.Tests/Streaming/EHStreamPerPartitionTests.cs index 37e1f07a87..eed25b711d 100644 --- a/test/Extensions/ServiceBus.Tests/Streaming/EHStreamPerPartitionTests.cs +++ b/test/Extensions/ServiceBus.Tests/Streaming/EHStreamPerPartitionTests.cs @@ -125,7 +125,7 @@ private async Task GenerateEvents(int streamCount, int eventsInStream) } } - private async Task CheckCounters(List consumers, int totalEventCount, bool assertIsTrue) + private static async Task CheckCounters(List consumers, int totalEventCount, bool assertIsTrue) { List> becomeConsumersTasks = consumers .Select((consumer, i) => consumer.GetNumberConsumed()) diff --git a/test/Extensions/Tester.Cosmos/ReminderTests_Cosmos_Standalone.cs b/test/Extensions/Tester.Cosmos/ReminderTests_Cosmos_Standalone.cs index 53fef253ca..9bd6f3189f 100644 --- a/test/Extensions/Tester.Cosmos/ReminderTests_Cosmos_Standalone.cs +++ b/test/Extensions/Tester.Cosmos/ReminderTests_Cosmos_Standalone.cs @@ -133,12 +133,12 @@ private ReminderEntry NewReminderEntry() }; } - private string NewClusterId() + private static string NewClusterId() { return string.Format("ReminderTest.{0}", Guid.NewGuid()); } - private async Task> GetAllRows(IReminderTable table) + private static async Task> GetAllRows(IReminderTable table) { ReminderTableData data = await table.ReadRows(0, 0xffffffff); return data.Reminders; diff --git a/test/Extensions/TesterAzureUtils/AsyncPipelineTests.cs b/test/Extensions/TesterAzureUtils/AsyncPipelineTests.cs index 749bde38c6..eba0a635e7 100644 --- a/test/Extensions/TesterAzureUtils/AsyncPipelineTests.cs +++ b/test/Extensions/TesterAzureUtils/AsyncPipelineTests.cs @@ -169,14 +169,14 @@ private async Task AsyncPipelineBlackBoxConsistencyTest(int workerCount) Assert.True(capacityReached.IsSet, "Pipeline capacity not reached; the delay length probably is too short to be useful."); Assert.True( - actualSec >= minTimeSec, + actualSec >= minTimeSec, string.Format("The unit test completed too early ({0} sec < {1} sec).", actualSec, minTimeSec)); Assert.True( - actualSec <= maxTimeSec, + actualSec <= maxTimeSec, string.Format("The unit test completed too late ({0} sec > {1} sec).", actualSec, maxTimeSec)); } - private void CheckPipelineState(int size, int capacity, InterlockedFlag capacityReached) + private static void CheckPipelineState(int size, int capacity, InterlockedFlag capacityReached) { Assert.True(size >= 0); Assert.True(capacity > 0); diff --git a/test/Extensions/TesterAzureUtils/Reminder/ReminderTests_Azure_Standalone.cs b/test/Extensions/TesterAzureUtils/Reminder/ReminderTests_Azure_Standalone.cs index 56a2f9805b..6d12d77410 100644 --- a/test/Extensions/TesterAzureUtils/Reminder/ReminderTests_Azure_Standalone.cs +++ b/test/Extensions/TesterAzureUtils/Reminder/ReminderTests_Azure_Standalone.cs @@ -142,12 +142,12 @@ private ReminderEntry NewReminderEntry() }; } - private string NewClusterId() + private static string NewClusterId() { return string.Format("ReminderTest.{0}", Guid.NewGuid()); } - private async Task> GetAllRows(IReminderTable table) + private static async Task> GetAllRows(IReminderTable table) { ReminderTableData data = await table.ReadRows(0, 0xffffffff); return data.Reminders; diff --git a/test/Extensions/TesterAzureUtils/SiloInstanceTableManagerTests.cs b/test/Extensions/TesterAzureUtils/SiloInstanceTableManagerTests.cs index 74ea587f31..a0d60ba9fb 100644 --- a/test/Extensions/TesterAzureUtils/SiloInstanceTableManagerTests.cs +++ b/test/Extensions/TesterAzureUtils/SiloInstanceTableManagerTests.cs @@ -282,7 +282,7 @@ private SiloInstanceTableEntry RegisterSiloInstance() return data; } - private void CheckSiloInstanceTableEntry(SiloInstanceTableEntry referenceEntry, SiloInstanceTableEntry entry) + private static void CheckSiloInstanceTableEntry(SiloInstanceTableEntry referenceEntry, SiloInstanceTableEntry entry) { Assert.Equal(referenceEntry.DeploymentId, entry.DeploymentId); Assert.Equal(referenceEntry.Address, entry.Address); diff --git a/test/Grains/BenchmarkGrains/Ping/LoadGrain.cs b/test/Grains/BenchmarkGrains/Ping/LoadGrain.cs index 437ab17d0e..a08622a2b1 100644 --- a/test/Grains/BenchmarkGrains/Ping/LoadGrain.cs +++ b/test/Grains/BenchmarkGrains/Ping/LoadGrain.cs @@ -44,7 +44,7 @@ private async Task RunGeneration(int run, int conncurrent) return report; } - private async Task ResolvePending(List pendingWork, Report report, bool all = false) + private static async Task ResolvePending(List pendingWork, Report report, bool all = false) { try { @@ -71,7 +71,7 @@ private async Task ResolvePending(List pendingWork, Report report, bool } } } - + private class Pending { public IPingGrain Grain { get; set; } diff --git a/test/Grains/BenchmarkGrains/Transaction/LoadGrain.cs b/test/Grains/BenchmarkGrains/Transaction/LoadGrain.cs index 00532f7d98..7072638a61 100644 --- a/test/Grains/BenchmarkGrains/Transaction/LoadGrain.cs +++ b/test/Grains/BenchmarkGrains/Transaction/LoadGrain.cs @@ -47,7 +47,7 @@ private async Task RunGeneration(int run, int transactions, int conncurr return report; } - private async Task> ResolvePending(List pending, Report report, bool all = false) + private static async Task> ResolvePending(List pending, Report report, bool all = false) { try { diff --git a/test/NonSilo.Tests/General/RingTests_Standalone.cs b/test/NonSilo.Tests/General/RingTests_Standalone.cs index d7326b9511..7872f96ca8 100644 --- a/test/NonSilo.Tests/General/RingTests_Standalone.cs +++ b/test/NonSilo.Tests/General/RingTests_Standalone.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using Microsoft.Extensions.Logging.Abstractions; using Orleans.Runtime; @@ -95,7 +95,7 @@ private void TestChurn(int[] indexesFails, int[] indexesJoins) VerifyRing(rings); } - private Dictionary CreateServers(int n) + private static Dictionary CreateServers(int n) { Dictionary rings = new Dictionary(); @@ -107,7 +107,7 @@ private Dictionary CreateServers(int n) return rings; } - private Dictionary Combine(Dictionary set1, Dictionary set2) + private static Dictionary Combine(Dictionary set1, Dictionary set2) { // tell set1 about every node in set2 foreach (ConsistentRingProvider crp in set1.Values) diff --git a/test/NonSilo.Tests/OrleansRuntime/Streams/BestFitBalancerTests.cs b/test/NonSilo.Tests/OrleansRuntime/Streams/BestFitBalancerTests.cs index b59fec8006..3be45ad343 100644 --- a/test/NonSilo.Tests/OrleansRuntime/Streams/BestFitBalancerTests.cs +++ b/test/NonSilo.Tests/OrleansRuntime/Streams/BestFitBalancerTests.cs @@ -147,7 +147,7 @@ public void OrderIrrelevantTest() } } - private void ValidateBalance(List buckets, List resources, Dictionary> balancerResults, int idealBalance) + private static void ValidateBalance(List buckets, List resources, Dictionary> balancerResults, int idealBalance) { var resultBuckets = new List(); var resultResources = new List(); diff --git a/test/NonSilo.Tests/SchedulerTests/OrleansTaskSchedulerBasicTests.cs b/test/NonSilo.Tests/SchedulerTests/OrleansTaskSchedulerBasicTests.cs index 5a3a1f585a..6ddfa39198 100644 --- a/test/NonSilo.Tests/SchedulerTests/OrleansTaskSchedulerBasicTests.cs +++ b/test/NonSilo.Tests/SchedulerTests/OrleansTaskSchedulerBasicTests.cs @@ -365,13 +365,13 @@ public async Task RequestContextProtectedInQueuedTasksTest() Assert.Null(RequestContext.Get(key)); } - private async Task AsyncCheckClearRequestContext(string key) + private static async Task AsyncCheckClearRequestContext(string key) { Assert.Null(RequestContext.Get(key)); await Task.Delay(TimeSpan.Zero); } - private Task NonAsyncCheckClearRequestContext(string key) + private static Task NonAsyncCheckClearRequestContext(string key) { Assert.Null(RequestContext.Get(key)); return Task.CompletedTask; diff --git a/test/Orleans.Serialization.UnitTests/InvokableTestInterfaces.cs b/test/Orleans.Serialization.UnitTests/InvokableTestInterfaces.cs index 093f3c89c4..30926dd010 100644 --- a/test/Orleans.Serialization.UnitTests/InvokableTestInterfaces.cs +++ b/test/Orleans.Serialization.UnitTests/InvokableTestInterfaces.cs @@ -28,7 +28,7 @@ protected MyInvokableProxyBase(CopyContextPool copyContextPool, CodecProvider co CopyContextPool = copyContextPool; CodecProvider = codecProvider; } - + protected TInvokable GetInvokable() where TInvokable : class, IInvokable, new() => InvokablePool.Get(); protected ValueTask InvokeAsync(IInvokable body) diff --git a/test/Orleans.Serialization.UnitTests/ManualVersionToleranceTests.cs b/test/Orleans.Serialization.UnitTests/ManualVersionToleranceTests.cs index 429951eb97..9dc81cbcde 100644 --- a/test/Orleans.Serialization.UnitTests/ManualVersionToleranceTests.cs +++ b/test/Orleans.Serialization.UnitTests/ManualVersionToleranceTests.cs @@ -318,7 +318,7 @@ public void ObjectWithoutNewFieldTest() _log.WriteLine($"Read references:\n{references}"); } - private void GetGeneratedSerializer(out IFieldCodec serializer) + private static void GetGeneratedSerializer(out IFieldCodec serializer) { var services = new ServiceCollection().AddSerializer(); var serviceProvider = services.BuildServiceProvider(); diff --git a/test/Tester/EventSourcingTests/AccountGrainTests.cs b/test/Tester/EventSourcingTests/AccountGrainTests.cs index c91443320f..c164c22b60 100644 --- a/test/Tester/EventSourcingTests/AccountGrainTests.cs +++ b/test/Tester/EventSourcingTests/AccountGrainTests.cs @@ -16,7 +16,7 @@ public AccountGrainTests(EventSourcingClusterFixture fixture) this.fixture = fixture; } - private async Task TestSequence(IAccountGrain account, bool hasLogStored) + private static async Task TestSequence(IAccountGrain account, bool hasLogStored) { Assert.Equal(0u, await account.Balance()); diff --git a/test/Tester/EventSourcingTests/CountersGrainTests.cs b/test/Tester/EventSourcingTests/CountersGrainTests.cs index 04c82c3d66..b84a1ed553 100644 --- a/test/Tester/EventSourcingTests/CountersGrainTests.cs +++ b/test/Tester/EventSourcingTests/CountersGrainTests.cs @@ -49,10 +49,10 @@ public async Task ConcurrentIncrements() } private static readonly string[] keys = { "a", "b", "c", "d", "e", "f", "g", "h" }; - private string RandomKey() { return keys[Random.Shared.Next(keys.Length)]; } + private static string RandomKey() { return keys[Random.Shared.Next(keys.Length)]; } - private async Task ConcurrentIncrementsRunner(ICountersGrain grain, int count, bool wait_for_confirmation_on_each) + private static async Task ConcurrentIncrementsRunner(ICountersGrain grain, int count, bool wait_for_confirmation_on_each) { // increment (count) times, on random keys, concurrently var tasks = new List(); diff --git a/test/Tester/HeterogeneousSilosTests/UpgradeTests/UpgradeTestsBase.cs b/test/Tester/HeterogeneousSilosTests/UpgradeTests/UpgradeTestsBase.cs index 846141a0fb..77e517926c 100644 --- a/test/Tester/HeterogeneousSilosTests/UpgradeTests/UpgradeTestsBase.cs +++ b/test/Tester/HeterogeneousSilosTests/UpgradeTests/UpgradeTestsBase.cs @@ -68,7 +68,7 @@ protected UpgradeTestsBase() assemblyGrainsV2 = GetVersionTestDirectory(testDirectory, GrainsV2ProjectName); } - private FileInfo GetVersionTestDirectory(DirectoryInfo testDirectory, string directoryName) + private static FileInfo GetVersionTestDirectory(DirectoryInfo testDirectory, string directoryName) { var projectDirectory = Path.Combine(testDirectory.FullName, VersionsProjectDirectory, directoryName, BinDirectory); diff --git a/test/Tester/Lifecycle/LifecycleTests.cs b/test/Tester/Lifecycle/LifecycleTests.cs index 3ebe1e7122..f722ceef61 100644 --- a/test/Tester/Lifecycle/LifecycleTests.cs +++ b/test/Tester/Lifecycle/LifecycleTests.cs @@ -132,7 +132,7 @@ public async Task MultiStageObserverLifecycleTest() Assert.True(multiStageObserver.Stopped.Values.All(o => o)); } - private async Task>> RunLifecycle(Dictionary observerCountByStage, TestStages? failOnStart, TestStages? failOnStop) + private static async Task>> RunLifecycle(Dictionary observerCountByStage, TestStages? failOnStart, TestStages? failOnStop) { // setup lifecycle observers var observersByStage = new Dictionary>(); diff --git a/test/Tester/LogFomatterTests.cs b/test/Tester/LogFomatterTests.cs index d1793944d8..b711b1468b 100644 --- a/test/Tester/LogFomatterTests.cs +++ b/test/Tester/LogFomatterTests.cs @@ -385,7 +385,7 @@ public void CustomFormatterResolverOverridesDefaultFormatter_PostRegistration() Assert.Equal(expected.ToString(), actual.ToString()); } - private TestLoggerFactory BuildOptionsExpectedResult() + private static TestLoggerFactory BuildOptionsExpectedResult() { var services = new ServiceCollection(); var testOptions = new TestOptions @@ -399,7 +399,7 @@ private TestLoggerFactory BuildOptionsExpectedResult() return expected; } - private TestLoggerFactory BuildNamedOptionsExpectedResult() + private static TestLoggerFactory BuildNamedOptionsExpectedResult() { var services = new ServiceCollection(); IOptionFormatter[] formatters = Enumerable diff --git a/test/TesterInternal/General/GrainPlacementTests.cs b/test/TesterInternal/General/GrainPlacementTests.cs index f82eb763c6..c810088918 100644 --- a/test/TesterInternal/General/GrainPlacementTests.cs +++ b/test/TesterInternal/General/GrainPlacementTests.cs @@ -132,13 +132,13 @@ private IEnumerable SampleEndpoint(IPlacementTestGrain grain, int sa yield return grain.GetEndpoint().Result; } - private IEnumerable CollectActivationIds(IPlacementTestGrain grain, int sampleSize) + private static IEnumerable CollectActivationIds(IPlacementTestGrain grain, int sampleSize) { for (var i = 0; i < sampleSize; ++i) yield return grain.GetActivationId().Result; } - private int ActivationCount(IEnumerable ids) + private static int ActivationCount(IEnumerable ids) { return ids.GroupBy(id => id).Count(); } diff --git a/test/TesterInternal/LivenessTests/ConsistentRingProviderTests.cs b/test/TesterInternal/LivenessTests/ConsistentRingProviderTests.cs index fccce49539..6676dc107e 100644 --- a/test/TesterInternal/LivenessTests/ConsistentRingProviderTests.cs +++ b/test/TesterInternal/LivenessTests/ConsistentRingProviderTests.cs @@ -107,7 +107,7 @@ public void ConsistentRingProvider_Test3() queueHistogram.Values.Min(list => list.Sum()), queueHistogram.Values.Max(list => list.Sum())); } - private Dictionary> GetQueueHistogram(List<(SiloAddress Key, List Value)> siloRanges, int totalNumQueues) + private static Dictionary> GetQueueHistogram(List<(SiloAddress Key, List Value)> siloRanges, int totalNumQueues) { var options = new HashRingStreamQueueMapperOptions(); options.TotalQueueCount = totalNumQueues;