Revert "Fixed R# warning: use extension blocks"

This reverts commit e8c2315.

Author: bkoelman

src/Examples/DapperExample/Repositories/CommandDefinitionExtensions.cs

@@ -8,18 +8,15 @@ internal static class CommandDefinitionExtensions
 {
     // SQL Server and MySQL require any active DbTransaction to be explicitly associated to the DbConnection.
 
-    extension(CommandDefinition command)
+    public static CommandDefinition Associate(this CommandDefinition command, DbTransaction transaction)
     {
-        public CommandDefinition Associate(DbTransaction transaction)
-        {
-            return new CommandDefinition(command.CommandText, command.Parameters, transaction, cancellationToken: command.CancellationToken);
-        }
+        return new CommandDefinition(command.CommandText, command.Parameters, transaction, cancellationToken: command.CancellationToken);
+    }
 
-        public CommandDefinition Associate(AmbientTransaction? transaction)
-        {
-            return transaction != null
-                ? new CommandDefinition(command.CommandText, command.Parameters, transaction.Current, cancellationToken: command.CancellationToken)
-                : command;
-        }
+    public static CommandDefinition Associate(this CommandDefinition command, AmbientTransaction? transaction)
+    {
+        return transaction != null
+            ? new CommandDefinition(command.CommandText, command.Parameters, transaction.Current, cancellationToken: command.CancellationToken)
+            : command;
     }
 }

src/Examples/NoEntityFrameworkExample/Data/ResourceGraphExtensions.cs

@@ -8,19 +8,16 @@ namespace NoEntityFrameworkExample.Data;
 
 internal static class ResourceGraphExtensions
 {
-    extension(IResourceGraph resourceGraph)
+    public static IReadOnlyModel ToEntityModel(this IResourceGraph resourceGraph)
     {
-        public IReadOnlyModel ToEntityModel()
-        {
-            var modelBuilder = new ModelBuilder();
-
-            foreach (ResourceType resourceType in resourceGraph.GetResourceTypes())
-            {
-                IncludeResourceType(resourceType, modelBuilder);
-            }
+        var modelBuilder = new ModelBuilder();
 
-            return modelBuilder.Model;
+        foreach (ResourceType resourceType in resourceGraph.GetResourceTypes())
+        {
+            IncludeResourceType(resourceType, modelBuilder);
         }
+
+        return modelBuilder.Model;
     }
 
     private static void IncludeResourceType(ResourceType resourceType, ModelBuilder builder)

src/JsonApiDotNetCore.Annotations/PolyfillCollectionExtensions.cs

@@ -5,11 +5,8 @@ namespace JsonApiDotNetCore;
 // These methods provide polyfills for lower .NET versions.
 internal static class PolyfillCollectionExtensions
 {
-    extension<T>(HashSet<T> source)
+    public static IReadOnlySet<T> AsReadOnly<T>(this HashSet<T> source)
     {
-        public IReadOnlySet<T> AsReadOnly()
-        {
-            return new ReadOnlySet<T>(source);
-        }
+        return new ReadOnlySet<T>(source);
     }
 }

src/JsonApiDotNetCore.Annotations/TypeExtensions.cs

@@ -2,31 +2,28 @@ namespace JsonApiDotNetCore;
 
 internal static class TypeExtensions
 {
-    extension(Type? source)
+    /// <summary>
+    /// Whether the specified source type implements or equals the specified interface.
+    /// </summary>
+    public static bool IsOrImplementsInterface<TInterface>(this Type? source)
     {
-        /// <summary>
-        /// Whether the specified source type implements or equals the specified interface.
-        /// </summary>
-        public bool IsOrImplementsInterface<TInterface>()
-        {
-            return IsOrImplementsInterface(source, typeof(TInterface));
-        }
-
-        /// <summary>
-        /// Whether the specified source type implements or equals the specified interface. This overload enables testing for an open generic interface.
-        /// </summary>
-        private bool IsOrImplementsInterface(Type interfaceType)
-        {
-            ArgumentNullException.ThrowIfNull(interfaceType);
+        return IsOrImplementsInterface(source, typeof(TInterface));
+    }
 
-            if (source == null)
-            {
-                return false;
-            }
+    /// <summary>
+    /// Whether the specified source type implements or equals the specified interface. This overload enables testing for an open generic interface.
+    /// </summary>
+    private static bool IsOrImplementsInterface(this Type? source, Type interfaceType)
+    {
+        ArgumentNullException.ThrowIfNull(interfaceType);
 
-            return AreTypesEqual(interfaceType, source, interfaceType.IsGenericType) ||
-                source.GetInterfaces().Any(type => AreTypesEqual(interfaceType, type, interfaceType.IsGenericType));
+        if (source == null)
+        {
+            return false;
         }
+
+        return AreTypesEqual(interfaceType, source, interfaceType.IsGenericType) ||
+            source.GetInterfaces().Any(type => AreTypesEqual(interfaceType, type, interfaceType.IsGenericType));
     }
 
     private static bool AreTypesEqual(Type left, Type right, bool isLeftGeneric)

src/JsonApiDotNetCore.OpenApi.Swashbuckle/ActionDescriptorExtensions.cs

@@ -7,36 +7,33 @@ namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 internal static class ActionDescriptorExtensions
 {
-    extension(ActionDescriptor descriptor)
+    public static MethodInfo? TryGetActionMethod(this ActionDescriptor descriptor)
     {
-        public MethodInfo? TryGetActionMethod()
-        {
-            ArgumentNullException.ThrowIfNull(descriptor);
-
-            if (descriptor is ControllerActionDescriptor controllerActionDescriptor)
-            {
-                return controllerActionDescriptor.MethodInfo;
-            }
+        ArgumentNullException.ThrowIfNull(descriptor);
 
-            return descriptor.EndpointMetadata.OfType<MethodInfo>().FirstOrDefault();
+        if (descriptor is ControllerActionDescriptor controllerActionDescriptor)
+        {
+            return controllerActionDescriptor.MethodInfo;
         }
 
-        public ControllerParameterDescriptor? GetBodyParameterDescriptor()
-        {
-            ArgumentNullException.ThrowIfNull(descriptor);
+        return descriptor.EndpointMetadata.OfType<MethodInfo>().FirstOrDefault();
+    }
 
-            ParameterDescriptor? parameterDescriptor = descriptor.Parameters.FirstOrDefault(parameterDescriptor =>
-                parameterDescriptor.BindingInfo?.BindingSource == BindingSource.Body);
+    public static ControllerParameterDescriptor? GetBodyParameterDescriptor(this ActionDescriptor descriptor)
+    {
+        ArgumentNullException.ThrowIfNull(descriptor);
 
-            if (parameterDescriptor != null)
-            {
-                var controllerParameterDescriptor = parameterDescriptor as ControllerParameterDescriptor;
-                ConsistencyGuard.ThrowIf(controllerParameterDescriptor == null);
+        ParameterDescriptor? parameterDescriptor = descriptor.Parameters.FirstOrDefault(parameterDescriptor =>
+            parameterDescriptor.BindingInfo?.BindingSource == BindingSource.Body);
 
-                return controllerParameterDescriptor;
-            }
+        if (parameterDescriptor != null)
+        {
+            var controllerParameterDescriptor = parameterDescriptor as ControllerParameterDescriptor;
+            ConsistencyGuard.ThrowIf(controllerParameterDescriptor == null);
 
-            return null;
+            return controllerParameterDescriptor;
         }
+
+        return null;
     }
 }

src/JsonApiDotNetCore.OpenApi.Swashbuckle/ObjectExtensions.cs

@@ -8,14 +8,11 @@ internal static class ObjectExtensions
         new(() => typeof(object).GetMethod(nameof(MemberwiseClone), BindingFlags.Instance | BindingFlags.NonPublic)!,
             LazyThreadSafetyMode.ExecutionAndPublication);
 
-    extension<T>(T source)
+    public static T MemberwiseClone<T>(this T source)
         where T : class
     {
-        public T MemberwiseClone()
-        {
-            ArgumentNullException.ThrowIfNull(source);
+        ArgumentNullException.ThrowIfNull(source);
 
-            return (T)MemberwiseCloneMethod.Value.Invoke(source, null)!;
-        }
+        return (T)MemberwiseCloneMethod.Value.Invoke(source, null)!;
     }
 }

src/JsonApiDotNetCore.OpenApi.Swashbuckle/OpenApiSchemaExtensions.cs

@@ -4,97 +4,85 @@ namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 internal static class OpenApiSchemaExtensions
 {
-    extension(IOpenApiSchema schema)
+    public static OpenApiSchema AsInlineSchema(this IOpenApiSchema schema)
     {
-        public OpenApiSchema AsInlineSchema()
-        {
-            ConsistencyGuard.ThrowIf(schema is not OpenApiSchema);
-            return (OpenApiSchema)schema;
-        }
+        ConsistencyGuard.ThrowIf(schema is not OpenApiSchema);
+        return (OpenApiSchema)schema;
+    }
 
-        public OpenApiSchemaReference AsReferenceSchema()
-        {
-            ConsistencyGuard.ThrowIf(schema is not OpenApiSchemaReference);
-            return (OpenApiSchemaReference)schema;
-        }
+    public static OpenApiSchemaReference AsReferenceSchema(this IOpenApiSchema schema)
+    {
+        ConsistencyGuard.ThrowIf(schema is not OpenApiSchemaReference);
+        return (OpenApiSchemaReference)schema;
     }
 
-    extension(OpenApiSchemaReference referenceSchema)
+    public static string GetReferenceId(this OpenApiSchemaReference referenceSchema)
     {
-        public string GetReferenceId()
-        {
-            string? schemaId = referenceSchema.Reference.Id;
-            ConsistencyGuard.ThrowIf(schemaId is null);
-            return schemaId;
-        }
+        string? schemaId = referenceSchema.Reference.Id;
+        ConsistencyGuard.ThrowIf(schemaId is null);
+        return schemaId;
     }
 
-    extension(OpenApiSchema inlineSchema)
+    public static void SetNullable(this OpenApiSchema inlineSchema, bool nullable)
     {
-        public void SetNullable(bool nullable)
-        {
-            ArgumentNullException.ThrowIfNull(inlineSchema);
+        ArgumentNullException.ThrowIfNull(inlineSchema);
 
-            if (nullable)
-            {
-                inlineSchema.Type ??= JsonSchemaType.Null;
-                inlineSchema.Type |= JsonSchemaType.Null;
-            }
-            else
+        if (nullable)
+        {
+            inlineSchema.Type ??= JsonSchemaType.Null;
+            inlineSchema.Type |= JsonSchemaType.Null;
+        }
+        else
+        {
+            if (inlineSchema.Type != null)
             {
-                if (inlineSchema.Type != null)
-                {
-                    inlineSchema.Type &= ~JsonSchemaType.Null;
-                }
+                inlineSchema.Type &= ~JsonSchemaType.Null;
             }
         }
+    }
+
+    public static void ReorderProperties(this OpenApiSchema inlineSchema, IEnumerable<string> propertyNamesInOrder)
+    {
+        ArgumentNullException.ThrowIfNull(inlineSchema);
+        ArgumentNullException.ThrowIfNull(propertyNamesInOrder);
 
-        public void ReorderProperties(IEnumerable<string> propertyNamesInOrder)
+        if (inlineSchema.Properties is { Count: > 1 })
         {
-            ArgumentNullException.ThrowIfNull(inlineSchema);
-            ArgumentNullException.ThrowIfNull(propertyNamesInOrder);
+            var propertiesInOrder = new Dictionary<string, IOpenApiSchema>();
 
-            if (inlineSchema.Properties is { Count: > 1 })
+            foreach (string propertyName in propertyNamesInOrder)
             {
-                var propertiesInOrder = new Dictionary<string, IOpenApiSchema>();
-
-                foreach (string propertyName in propertyNamesInOrder)
+                if (inlineSchema.Properties.TryGetValue(propertyName, out IOpenApiSchema? schema))
                 {
-                    if (inlineSchema.Properties.TryGetValue(propertyName, out IOpenApiSchema? schema))
-                    {
-                        propertiesInOrder.Add(propertyName, schema);
-                    }
+                    propertiesInOrder.Add(propertyName, schema);
                 }
+            }
 
-                ConsistencyGuard.ThrowIf(inlineSchema.Properties.Count != propertiesInOrder.Count);
+            ConsistencyGuard.ThrowIf(inlineSchema.Properties.Count != propertiesInOrder.Count);
 
-                inlineSchema.Properties = propertiesInOrder;
-            }
+            inlineSchema.Properties = propertiesInOrder;
         }
     }
 
-    extension(IOpenApiSchema source)
+    public static OpenApiSchema WrapInExtendedSchema(this IOpenApiSchema source)
     {
-        public OpenApiSchema WrapInExtendedSchema()
-        {
-            ArgumentNullException.ThrowIfNull(source);
-
-            return new OpenApiSchema
-            {
-                AllOf = [source]
-            };
-        }
+        ArgumentNullException.ThrowIfNull(source);
 
-        public IOpenApiSchema UnwrapLastExtendedSchema()
+        return new OpenApiSchema
         {
-            ArgumentNullException.ThrowIfNull(source);
+            AllOf = [source]
+        };
+    }
 
-            if (source is OpenApiSchema && source.AllOf is { Count: > 0 })
-            {
-                return source.AllOf.Last();
-            }
+    public static IOpenApiSchema UnwrapLastExtendedSchema(this IOpenApiSchema source)
+    {
+        ArgumentNullException.ThrowIfNull(source);
 
-            return source;
+        if (source is OpenApiSchema && source.AllOf is { Count: > 0 })
+        {
+            return source.AllOf.Last();
         }
+
+        return source;
     }
 }

src/JsonApiDotNetCore.OpenApi.Swashbuckle/SchemaRepositoryExtensions.cs

@@ -6,26 +6,23 @@ namespace JsonApiDotNetCore.OpenApi.Swashbuckle;
 
 internal static class SchemaRepositoryExtensions
 {
-    extension(SchemaRepository schemaRepository)
+    public static OpenApiSchemaReference LookupByType(this SchemaRepository schemaRepository, Type schemaType)
     {
-        public OpenApiSchemaReference LookupByType(Type schemaType)
-        {
-            ArgumentNullException.ThrowIfNull(schemaRepository);
-            ArgumentNullException.ThrowIfNull(schemaType);
-
-            if (!schemaRepository.TryLookupByTypeSafe(schemaType, out OpenApiSchemaReference? referenceSchema))
-            {
-                throw new InvalidOperationException($"Reference schema for '{schemaType.Name}' does not exist.");
-            }
-
-            return referenceSchema;
-        }
+        ArgumentNullException.ThrowIfNull(schemaRepository);
+        ArgumentNullException.ThrowIfNull(schemaType);
 
-        public bool TryLookupByTypeSafe(Type type, [NotNullWhen(true)] out OpenApiSchemaReference? referenceSchema)
+        if (!schemaRepository.TryLookupByTypeSafe(schemaType, out OpenApiSchemaReference? referenceSchema))
         {
-            bool result = schemaRepository.TryLookupByType(type, out OpenApiSchemaReference? obliviousReferenceSchema);
-            referenceSchema = result ? obliviousReferenceSchema : null;
-            return result;
+            throw new InvalidOperationException($"Reference schema for '{schemaType.Name}' does not exist.");
         }
+
+        return referenceSchema;
+    }
+
+    public static bool TryLookupByTypeSafe(this SchemaRepository schemaRepository, Type type, [NotNullWhen(true)] out OpenApiSchemaReference? referenceSchema)
+    {
+        bool result = schemaRepository.TryLookupByType(type, out OpenApiSchemaReference? obliviousReferenceSchema);
+        referenceSchema = result ? obliviousReferenceSchema : null;
+        return result;
     }
 }