Switched to file-scoped namespaces

Author: Bart Koelman

JsonApiDotNetCore.sln.DotSettings

@@ -27,6 +27,7 @@ JsonApiDotNetCore.ArgumentGuard.NotNull($EXPR$, $NAME$);</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeLocalFunctionBody/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeMethodOrOperatorBody/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeMissingParentheses/@EntryIndexedValue">SUGGESTION</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeNamespaceBody/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeStaticMemberQualifier/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeThisQualifier/@EntryIndexedValue">SUGGESTION</s:String>
@@ -83,7 +84,7 @@ JsonApiDotNetCore.ArgumentGuard.NotNull($EXPR$, $NAME$);</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseEmptyTypesField/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseEventArgsEmptyField/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002ELocal/@EntryIndexedValue">WARNING</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=JADNC_0020Full_0020Cleanup/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="JADNC Full Cleanup"&gt;&lt;XMLReformatCode&gt;True&lt;/XMLReformatCode&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="True" ArrangeBraces="True" ArrangeAttributes="True" ArrangeArgumentsStyle="True" ArrangeCodeBodyStyle="True" ArrangeVarStyle="True" ArrangeTrailingCommas="True" ArrangeObjectCreation="True" ArrangeDefaultValue="True" /&gt;&lt;CssAlphabetizeProperties&gt;True&lt;/CssAlphabetizeProperties&gt;&lt;JsInsertSemicolon&gt;True&lt;/JsInsertSemicolon&gt;&lt;FormatAttributeQuoteDescriptor&gt;True&lt;/FormatAttributeQuoteDescriptor&gt;&lt;CorrectVariableKindsDescriptor&gt;True&lt;/CorrectVariableKindsDescriptor&gt;&lt;VariablesToInnerScopesDescriptor&gt;True&lt;/VariablesToInnerScopesDescriptor&gt;&lt;StringToTemplatesDescriptor&gt;True&lt;/StringToTemplatesDescriptor&gt;&lt;JsReformatCode&gt;True&lt;/JsReformatCode&gt;&lt;JsFormatDocComments&gt;True&lt;/JsFormatDocComments&gt;&lt;RemoveRedundantQualifiersTs&gt;True&lt;/RemoveRedundantQualifiersTs&gt;&lt;OptimizeImportsTs&gt;True&lt;/OptimizeImportsTs&gt;&lt;OptimizeReferenceCommentsTs&gt;True&lt;/OptimizeReferenceCommentsTs&gt;&lt;PublicModifierStyleTs&gt;True&lt;/PublicModifierStyleTs&gt;&lt;ExplicitAnyTs&gt;True&lt;/ExplicitAnyTs&gt;&lt;TypeAnnotationStyleTs&gt;True&lt;/TypeAnnotationStyleTs&gt;&lt;RelativePathStyleTs&gt;True&lt;/RelativePathStyleTs&gt;&lt;AsInsteadOfCastTs&gt;True&lt;/AsInsteadOfCastTs&gt;&lt;HtmlReformatCode&gt;True&lt;/HtmlReformatCode&gt;&lt;AspOptimizeRegisterDirectives&gt;True&lt;/AspOptimizeRegisterDirectives&gt;&lt;RemoveCodeRedundancies&gt;True&lt;/RemoveCodeRedundancies&gt;&lt;CSUseAutoProperty&gt;True&lt;/CSUseAutoProperty&gt;&lt;CSMakeFieldReadonly&gt;True&lt;/CSMakeFieldReadonly&gt;&lt;CSMakeAutoPropertyGetOnly&gt;True&lt;/CSMakeAutoPropertyGetOnly&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CssReformatCode&gt;True&lt;/CssReformatCode&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSharpFormatDocComments&gt;True&lt;/CSharpFormatDocComments&gt;&lt;CSReorderTypeMembers&gt;True&lt;/CSReorderTypeMembers&gt;&lt;XAMLCollapseEmptyTags&gt;False&lt;/XAMLCollapseEmptyTags&gt;&lt;/Profile&gt;</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=JADNC_0020Full_0020Cleanup/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="JADNC Full Cleanup"&gt;&lt;XMLReformatCode&gt;True&lt;/XMLReformatCode&gt;&lt;CSCodeStyleAttributes ArrangeTypeAccessModifier="True" ArrangeTypeMemberAccessModifier="True" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="True" ArrangeBraces="True" ArrangeAttributes="True" ArrangeArgumentsStyle="True" ArrangeCodeBodyStyle="True" ArrangeVarStyle="True" ArrangeTrailingCommas="True" ArrangeObjectCreation="True" ArrangeDefaultValue="True" ArrangeNamespaces="True" /&gt;&lt;CssAlphabetizeProperties&gt;True&lt;/CssAlphabetizeProperties&gt;&lt;JsInsertSemicolon&gt;True&lt;/JsInsertSemicolon&gt;&lt;FormatAttributeQuoteDescriptor&gt;True&lt;/FormatAttributeQuoteDescriptor&gt;&lt;CorrectVariableKindsDescriptor&gt;True&lt;/CorrectVariableKindsDescriptor&gt;&lt;VariablesToInnerScopesDescriptor&gt;True&lt;/VariablesToInnerScopesDescriptor&gt;&lt;StringToTemplatesDescriptor&gt;True&lt;/StringToTemplatesDescriptor&gt;&lt;JsReformatCode&gt;True&lt;/JsReformatCode&gt;&lt;JsFormatDocComments&gt;True&lt;/JsFormatDocComments&gt;&lt;RemoveRedundantQualifiersTs&gt;True&lt;/RemoveRedundantQualifiersTs&gt;&lt;OptimizeImportsTs&gt;True&lt;/OptimizeImportsTs&gt;&lt;OptimizeReferenceCommentsTs&gt;True&lt;/OptimizeReferenceCommentsTs&gt;&lt;PublicModifierStyleTs&gt;True&lt;/PublicModifierStyleTs&gt;&lt;ExplicitAnyTs&gt;True&lt;/ExplicitAnyTs&gt;&lt;TypeAnnotationStyleTs&gt;True&lt;/TypeAnnotationStyleTs&gt;&lt;RelativePathStyleTs&gt;True&lt;/RelativePathStyleTs&gt;&lt;AsInsteadOfCastTs&gt;True&lt;/AsInsteadOfCastTs&gt;&lt;HtmlReformatCode&gt;True&lt;/HtmlReformatCode&gt;&lt;AspOptimizeRegisterDirectives&gt;True&lt;/AspOptimizeRegisterDirectives&gt;&lt;RemoveCodeRedundancies&gt;True&lt;/RemoveCodeRedundancies&gt;&lt;CSUseAutoProperty&gt;True&lt;/CSUseAutoProperty&gt;&lt;CSMakeFieldReadonly&gt;True&lt;/CSMakeFieldReadonly&gt;&lt;CSMakeAutoPropertyGetOnly&gt;True&lt;/CSMakeAutoPropertyGetOnly&gt;&lt;CSArrangeQualifiers&gt;True&lt;/CSArrangeQualifiers&gt;&lt;CSFixBuiltinTypeReferences&gt;True&lt;/CSFixBuiltinTypeReferences&gt;&lt;CssReformatCode&gt;True&lt;/CssReformatCode&gt;&lt;CSOptimizeUsings&gt;&lt;OptimizeUsings&gt;True&lt;/OptimizeUsings&gt;&lt;/CSOptimizeUsings&gt;&lt;CSShortenReferences&gt;True&lt;/CSShortenReferences&gt;&lt;CSReformatCode&gt;True&lt;/CSReformatCode&gt;&lt;CSharpFormatDocComments&gt;True&lt;/CSharpFormatDocComments&gt;&lt;CSReorderTypeMembers&gt;True&lt;/CSReorderTypeMembers&gt;&lt;XAMLCollapseEmptyTags&gt;False&lt;/XAMLCollapseEmptyTags&gt;&lt;/Profile&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeCleanup/SilentCleanupProfile/@EntryValue">JADNC Full Cleanup</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOR/@EntryValue">Required</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOREACH/@EntryValue">Required</s:String>

benchmarks/Deserialization/DeserializationBenchmarkBase.cs

@@ -9,114 +9,113 @@
 using JsonApiDotNetCore.Serialization.Request.Adapters;
 using Microsoft.Extensions.Logging.Abstractions;
 
-namespace Benchmarks.Deserialization
+namespace Benchmarks.Deserialization;
+
+public abstract class DeserializationBenchmarkBase
 {
-    public abstract class DeserializationBenchmarkBase
-    {
-        protected readonly JsonSerializerOptions SerializerReadOptions;
-        protected readonly DocumentAdapter DocumentAdapter;
+    protected readonly JsonSerializerOptions SerializerReadOptions;
+    protected readonly DocumentAdapter DocumentAdapter;
 
-        protected DeserializationBenchmarkBase()
-        {
-            var options = new JsonApiOptions();
-            IResourceGraph resourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance).Add<IncomingResource, int>().Build();
-            options.SerializerOptions.Converters.Add(new ResourceObjectConverter(resourceGraph));
-            SerializerReadOptions = ((IJsonApiOptions)options).SerializerReadOptions;
+    protected DeserializationBenchmarkBase()
+    {
+        var options = new JsonApiOptions();
+        IResourceGraph resourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance).Add<IncomingResource, int>().Build();
+        options.SerializerOptions.Converters.Add(new ResourceObjectConverter(resourceGraph));
+        SerializerReadOptions = ((IJsonApiOptions)options).SerializerReadOptions;
 
-            var serviceContainer = new ServiceContainer();
-            var resourceFactory = new ResourceFactory(serviceContainer);
-            var resourceDefinitionAccessor = new ResourceDefinitionAccessor(resourceGraph, serviceContainer);
+        var serviceContainer = new ServiceContainer();
+        var resourceFactory = new ResourceFactory(serviceContainer);
+        var resourceDefinitionAccessor = new ResourceDefinitionAccessor(resourceGraph, serviceContainer);
 
-            serviceContainer.AddService(typeof(IResourceDefinitionAccessor), resourceDefinitionAccessor);
+        serviceContainer.AddService(typeof(IResourceDefinitionAccessor), resourceDefinitionAccessor);
 
-            serviceContainer.AddService(typeof(IResourceDefinition<IncomingResource, int>),
-                new JsonApiResourceDefinition<IncomingResource, int>(resourceGraph));
+        serviceContainer.AddService(typeof(IResourceDefinition<IncomingResource, int>),
+            new JsonApiResourceDefinition<IncomingResource, int>(resourceGraph));
 
-            // ReSharper disable once VirtualMemberCallInConstructor
-            JsonApiRequest request = CreateJsonApiRequest(resourceGraph);
-            var targetedFields = new TargetedFields();
+        // ReSharper disable once VirtualMemberCallInConstructor
+        JsonApiRequest request = CreateJsonApiRequest(resourceGraph);
+        var targetedFields = new TargetedFields();
 
-            var resourceIdentifierObjectAdapter = new ResourceIdentifierObjectAdapter(resourceGraph, resourceFactory);
-            var relationshipDataAdapter = new RelationshipDataAdapter(resourceIdentifierObjectAdapter);
-            var resourceObjectAdapter = new ResourceObjectAdapter(resourceGraph, resourceFactory, options, relationshipDataAdapter);
-            var resourceDataAdapter = new ResourceDataAdapter(resourceDefinitionAccessor, resourceObjectAdapter);
+        var resourceIdentifierObjectAdapter = new ResourceIdentifierObjectAdapter(resourceGraph, resourceFactory);
+        var relationshipDataAdapter = new RelationshipDataAdapter(resourceIdentifierObjectAdapter);
+        var resourceObjectAdapter = new ResourceObjectAdapter(resourceGraph, resourceFactory, options, relationshipDataAdapter);
+        var resourceDataAdapter = new ResourceDataAdapter(resourceDefinitionAccessor, resourceObjectAdapter);
 
-            var atomicReferenceAdapter = new AtomicReferenceAdapter(resourceGraph, resourceFactory);
-            var atomicOperationResourceDataAdapter = new ResourceDataInOperationsRequestAdapter(resourceDefinitionAccessor, resourceObjectAdapter);
+        var atomicReferenceAdapter = new AtomicReferenceAdapter(resourceGraph, resourceFactory);
+        var atomicOperationResourceDataAdapter = new ResourceDataInOperationsRequestAdapter(resourceDefinitionAccessor, resourceObjectAdapter);
 
-            var atomicOperationObjectAdapter = new AtomicOperationObjectAdapter(options, atomicReferenceAdapter,
-                atomicOperationResourceDataAdapter, relationshipDataAdapter);
+        var atomicOperationObjectAdapter = new AtomicOperationObjectAdapter(options, atomicReferenceAdapter,
+            atomicOperationResourceDataAdapter, relationshipDataAdapter);
 
-            var resourceDocumentAdapter = new DocumentInResourceOrRelationshipRequestAdapter(options, resourceDataAdapter, relationshipDataAdapter);
-            var operationsDocumentAdapter = new DocumentInOperationsRequestAdapter(options, atomicOperationObjectAdapter);
+        var resourceDocumentAdapter = new DocumentInResourceOrRelationshipRequestAdapter(options, resourceDataAdapter, relationshipDataAdapter);
+        var operationsDocumentAdapter = new DocumentInOperationsRequestAdapter(options, atomicOperationObjectAdapter);
 
-            DocumentAdapter = new DocumentAdapter(request, targetedFields, resourceDocumentAdapter, operationsDocumentAdapter);
-        }
+        DocumentAdapter = new DocumentAdapter(request, targetedFields, resourceDocumentAdapter, operationsDocumentAdapter);
+    }
 
-        protected abstract JsonApiRequest CreateJsonApiRequest(IResourceGraph resourceGraph);
+    protected abstract JsonApiRequest CreateJsonApiRequest(IResourceGraph resourceGraph);
 
-        [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-        public sealed class IncomingResource : Identifiable<int>
-        {
-            [Attr]
-            public bool Attribute01 { get; set; }
+    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+    public sealed class IncomingResource : Identifiable<int>
+    {
+        [Attr]
+        public bool Attribute01 { get; set; }
 
-            [Attr]
-            public char Attribute02 { get; set; }
+        [Attr]
+        public char Attribute02 { get; set; }
 
-            [Attr]
-            public ulong? Attribute03 { get; set; }
+        [Attr]
+        public ulong? Attribute03 { get; set; }
 
-            [Attr]
-            public decimal Attribute04 { get; set; }
+        [Attr]
+        public decimal Attribute04 { get; set; }
 
-            [Attr]
-            public float? Attribute05 { get; set; }
+        [Attr]
+        public float? Attribute05 { get; set; }
 
-            [Attr]
-            public string Attribute06 { get; set; } = null!;
+        [Attr]
+        public string Attribute06 { get; set; } = null!;
 
-            [Attr]
-            public DateTime? Attribute07 { get; set; }
+        [Attr]
+        public DateTime? Attribute07 { get; set; }
 
-            [Attr]
-            public DateTimeOffset? Attribute08 { get; set; }
+        [Attr]
+        public DateTimeOffset? Attribute08 { get; set; }
 
-            [Attr]
-            public TimeSpan? Attribute09 { get; set; }
+        [Attr]
+        public TimeSpan? Attribute09 { get; set; }
 
-            [Attr]
-            public DayOfWeek Attribute10 { get; set; }
+        [Attr]
+        public DayOfWeek Attribute10 { get; set; }
 
-            [HasOne]
-            public IncomingResource Single1 { get; set; } = null!;
+        [HasOne]
+        public IncomingResource Single1 { get; set; } = null!;
 
-            [HasOne]
-            public IncomingResource Single2 { get; set; } = null!;
+        [HasOne]
+        public IncomingResource Single2 { get; set; } = null!;
 
-            [HasOne]
-            public IncomingResource Single3 { get; set; } = null!;
+        [HasOne]
+        public IncomingResource Single3 { get; set; } = null!;
 
-            [HasOne]
-            public IncomingResource Single4 { get; set; } = null!;
+        [HasOne]
+        public IncomingResource Single4 { get; set; } = null!;
 
-            [HasOne]
-            public IncomingResource Single5 { get; set; } = null!;
+        [HasOne]
+        public IncomingResource Single5 { get; set; } = null!;
 
-            [HasMany]
-            public ISet<IncomingResource> Multi1 { get; set; } = null!;
+        [HasMany]
+        public ISet<IncomingResource> Multi1 { get; set; } = null!;
 
-            [HasMany]
-            public ISet<IncomingResource> Multi2 { get; set; } = null!;
+        [HasMany]
+        public ISet<IncomingResource> Multi2 { get; set; } = null!;
 
-            [HasMany]
-            public ISet<IncomingResource> Multi3 { get; set; } = null!;
+        [HasMany]
+        public ISet<IncomingResource> Multi3 { get; set; } = null!;
 
-            [HasMany]
-            public ISet<IncomingResource> Multi4 { get; set; } = null!;
+        [HasMany]
+        public ISet<IncomingResource> Multi4 { get; set; } = null!;
 
-            [HasMany]
-            public ISet<IncomingResource> Multi5 { get; set; } = null!;
-        }
+        [HasMany]
+        public ISet<IncomingResource> Multi5 { get; set; } = null!;
     }
 }