MobileTeleSystems · genusP · Nov 27, 2024 · Oct 3, 2024 · Oct 3, 2024 · Oct 3, 2024
diff --git a/.editorconfig b/.editorconfig
@@ -276,7 +276,6 @@ dotnet_diagnostic.SA1200.severity = none
 dotnet_diagnostic.SA1309.severity = none
 dotnet_diagnostic.SA1310.severity = none
 dotnet_diagnostic.SA1311.severity = none
-dotnet_diagnostic.SA1503.severity = none
 dotnet_diagnostic.SA1600.severity = none
 dotnet_diagnostic.SA1623.severity = none
 dotnet_diagnostic.SA1633.severity = silent

diff --git a/ApiCodeGenerator.ruleset b/ApiCodeGenerator.ruleset
@@ -80,7 +80,6 @@
     <Rule Id="SA1309" Action="None" />
     <Rule Id="SA1310" Action="None" />
     <Rule Id="SA1311" Action="None" />
-    <Rule Id="SA1503" Action="None" />
     <Rule Id="SA1600" Action="None" />
     <Rule Id="SA1623" Action="None" />
     <Rule Id="SA1633" Action="Hidden" />

diff --git a/src/ApiCodeGenerator.Abstraction/AssemblyResolver.cs b/src/ApiCodeGenerator.Abstraction/AssemblyResolver.cs
@@ -113,14 +113,18 @@ public static void Unregister()
         {
             var thisAsm = Assembly.GetCallingAssembly();
             if (assemblyName == thisAsm.GetName())
+            {
                 return null;
+            }
 
             var path = _resolvers.Select(r => r.Invoke(assemblyName)).FirstOrDefault(p => p != null);
 
             var key = assemblyName.Name;
 
             if (path == null && _asmPaths.TryGetValue(key, out var item))
+            {
                 path = item.Path;
+            }
 
             return path == null
                 ? null

diff --git a/src/ApiCodeGenerator.Abstraction/GeneratorContext.cs b/src/ApiCodeGenerator.Abstraction/GeneratorContext.cs
@@ -31,7 +31,7 @@ internal GeneratorContext(
 
         public ILogger? Logger { get; internal set; }
 
-        public T? GetSettings<T>(JsonSerializer? jsonSerializer = null, IReadOnlyDictionary<string, string>? additionalVariables = null)
+        public T? GetSettings<T>(JsonSerializer? jsonSerializer, IReadOnlyDictionary<string, string>? additionalVariables)
             where T : class
             => (T?)_settingsFactory(typeof(T), jsonSerializer, additionalVariables);
     }

diff --git a/src/ApiCodeGenerator.AsyncApi/CSharp/CSharpGeneratorBaseSettings.cs b/src/ApiCodeGenerator.AsyncApi/CSharp/CSharpGeneratorBaseSettings.cs
@@ -18,8 +18,8 @@ protected CSharpGeneratorBaseSettings()
 
         CSharpGeneratorSettings.TemplateFactory = new DefaultTemplateFactory(CSharpGeneratorSettings, new[]
         {
-            typeof(CSharpGeneratorBaseSettings).GetType().Assembly,
-            typeof(CSharpGeneratorSettings).GetType().Assembly,
+            GetType().Assembly,
+            typeof(CSharpGeneratorSettings).Assembly,
         });
 
         ResponseArrayType = "System.Collections.Generic.ICollection";

diff --git a/src/ApiCodeGenerator.AsyncApi/CSharp/Models/CSharpOperationModel.cs b/src/ApiCodeGenerator.AsyncApi/CSharp/Models/CSharpOperationModel.cs
@@ -52,13 +52,13 @@ public CSharpOperationModel(
 
     public CSharpParameterModel[] Parameters { get; }
 
-    public string PayloadType => _payloadType ??= ResolvePayloadType(Operation.Message.ActualObject.Payload.ActualSchema);
+    public string PayloadType => _payloadType ??= ResolvePayloadType(Operation.Message.ActualObject.Payload.ActualSchema, hint: null);
 
     protected Channel Channel { get; }
 
     protected Operation Operation { get; }
 
-    protected virtual string ResolvePayloadType(JsonSchema jsonSchema, string? hint = null)
+    protected virtual string ResolvePayloadType(JsonSchema jsonSchema, string? hint)
     {
         if (!jsonSchema.HasTypeNameTitle && string.IsNullOrEmpty(hint))
         {

diff --git a/src/ApiCodeGenerator.AsyncApi/DOM/Serialization/InheritanceConverter.cs b/src/ApiCodeGenerator.AsyncApi/DOM/Serialization/InheritanceConverter.cs
@@ -57,6 +57,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object? exis
         /// <inheritdoc/>
         public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
         {
+            throw new NotSupportedException();
         }
 
         private static Dictionary<string, Func<T>> GetFactories()

diff --git a/src/ApiCodeGenerator.Core/ApiDocumentProvider.cs b/src/ApiCodeGenerator.Core/ApiDocumentProvider.cs
@@ -43,29 +43,41 @@ public ApiDocumentProvider(IFileProvider fileProvider, HttpClient httpClient)
                     else
                     {
                         if (Uri.TryCreate(documentSource.FromDocument.Url, UriKind.Absolute, out var url))
+                        {
                             return await FromUrlAsync(url);
+                        }
                         else
+                        {
                             return Failed("Invalid url format", null);
+                        }
                     }
                 }
                 else
                 {
                     var json = documentSource.FromDocument.Json!;
                     if (IsPath(json))
+                    {
                         return await FromFileAsync(json);
+                    }
                     else
+                    {
                         return FromContent(json, null);
+                    }
                 }
             }
 
             if (documentSource.JsonSchemaToOpenApi != null)
             {
                 var data = documentSource.JsonSchemaToOpenApi;
                 if (string.IsNullOrEmpty(data.Name))
+                {
                     return Failed("jsonSchemaToOpenApi.name must be not null or empty", null);
+                }
 
                 if (string.IsNullOrEmpty(data.Schema))
+                {
                     return Failed("jsonSchemaToOpenApi.schema must be not null or empty", null);
+                }
 
                 if (IsPath(data.Schema))
                 {

diff --git a/src/ApiCodeGenerator.Core/ExtensionManager/ExtensionLoader.cs b/src/ApiCodeGenerator.Core/ExtensionManager/ExtensionLoader.cs
@@ -66,11 +66,15 @@ private static void GetAndMergeDict<T>(Type type, string propName, Dictionary<st
             if (propInfo != null)
             {
                 if (!typeof(IDictionary<string, T>).IsAssignableFrom(propInfo.PropertyType))
+                {
                     throw new InvalidOperationException($"Property {propName} in assembly {type.Assembly.FullName} must return type IDictionary<string, {typeof(T)}>");
+                }
 
                 var value = (IDictionary<string, T>)propInfo.GetValue(type, null);
                 foreach (var kv in value)
+                {
                     dict.Add(kv.Key, kv.Value);
+                }
             }
         }
 
@@ -80,7 +84,9 @@ private static void GetAndMergeDictOfList<T>(Type type, string propName, Diction
             if (propInfo != null)
             {
                 if (!typeof(IDictionary<string, T>).IsAssignableFrom(propInfo.PropertyType))
+                {
                     throw new InvalidOperationException($"Property {propName} in assembly {type.Assembly.FullName} must return type IDictionary<string, {typeof(T)}>");
+                }
 
                 var value = (IDictionary<string, T>)propInfo.GetValue(type, null);
                 if (value.Any())

diff --git a/src/ApiCodeGenerator.Core/ExtensionManager/Extensions.cs b/src/ApiCodeGenerator.Core/ExtensionManager/Extensions.cs
@@ -10,7 +10,7 @@ namespace ApiCodeGenerator.Core.ExtensionManager
     /// <summary>
     /// Информация о расширениях.
     /// </summary>
-    public class Extensions : IExtensions
+    internal class Extensions : IExtensions
     {
         public Extensions(
             IReadOnlyDictionary<string, ContentGeneratorFactory>? codeGenerators = null,

diff --git a/src/ApiCodeGenerator.Core/NswagDocument/Converters/VariableConverter.cs b/src/ApiCodeGenerator.Core/NswagDocument/Converters/VariableConverter.cs
@@ -34,7 +34,9 @@ public override bool CanConvert(Type objectType)
         public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
         {
             if (reader.Value != null)
+            {
                 return _replaceExpression.Replace((string)reader.Value, Replace);
+            }
 
             return null;
         }

diff --git a/src/ApiCodeGenerator.Core/NswagDocument/PreprocessorHelper.cs b/src/ApiCodeGenerator.Core/NswagDocument/PreprocessorHelper.cs
@@ -13,21 +13,29 @@ internal static class PreprocessorHelper
         public static Preprocessors GetPreprocessors(IExtensions? extensions, IDictionary<string, JObject?>? processors, ILogger? log)
         {
             if (processors == null)
+            {
                 return new Preprocessors(new Dictionary<Type, Delegate[]>());
+            }
 
             var result = new Dictionary<Type, List<Delegate>>();
             foreach (var name in processors.Keys)
             {
                 var value = processors[name]?.ToString(Formatting.None);
 
                 if (extensions?.Preprocessors.TryGetValue(name, out var type) != true)
+                {
                     throw new InvalidOperationException($"Preprocessor with name '{name}' not registred.");
+                }
 
                 foreach (var (dataType, dlgt) in CreatePreprocessors(name, type, value, log))
                     if (result.TryGetValue(dataType, out var list))
+                    {
                         list.Add(dlgt);
+                    }
                     else
+                    {
                         result[dataType] = new List<Delegate> { dlgt };
+                    }
             }
 
             return new Preprocessors(result.ToDictionary(i => i.Key, i => i.Value.ToArray()));
@@ -41,7 +49,9 @@ public static Preprocessors GetPreprocessors(IExtensions? extensions, IDictionar
                 var ctor = type.GetConstructors().First();
                 var ctorParams = ctor.GetParameters();
                 if (ctorParams.Length > 1 || (ctorParams.Length == 1 && ctorParams[0].ParameterType != typeof(string)))
+                {
                     throw new InvalidOperationException($"Constructor with one or zero parameters not found for preprocessor '{name}'");
+                }
 
                 var processor = ctor.GetParameters().Length == 0
                     ? Activator.CreateInstance(type)

diff --git a/src/ApiCodeGenerator.Core/NswagDocumentFactory.cs b/src/ApiCodeGenerator.Core/NswagDocumentFactory.cs
@@ -85,7 +85,9 @@ public Document LoadNswagDocument(TextReader reader, IReadOnlyDictionary<string,
             };
 
             if (variables?.Any() == true)
+            {
                 settings.Converters.Add(new VariableConverter(variables));
+            }
 
             var jsonSerializer = JsonSerializer.Create(settings);
             Document? document;
@@ -137,7 +139,9 @@ void MergeObject(IContractResolver contractResolver, JObject doc, JObject baseDo
                         curSrcToken = curSrcToken[curProp.PropertyName] as JObject;
 
                         if (curSrcToken is null || curTargToken is null)
+                        {
                             break;
+                        }
 
                         curContract = contractResolver.ResolveContract(curProp.PropertyType);
                     }

diff --git a/src/ApiCodeGenerator.Core/PhysicalFileProvider.cs b/src/ApiCodeGenerator.Core/PhysicalFileProvider.cs
@@ -26,7 +26,9 @@ public async Task WriteAllTextAsync(string path, string contents)
         {
             var outDir = Path.GetDirectoryName(path);
             if (!string.IsNullOrEmpty(outDir) && !Directory.Exists(outDir))
+            {
                 Directory.CreateDirectory(outDir);
+            }
 
             using var stream = File.Open(path, FileMode.Create, FileAccess.Write, FileShare.None);
             using var writer = new StreamWriter(stream);

diff --git a/src/ApiCodeGenerator.OpenApi/ContentGeneratorBase.cs b/src/ApiCodeGenerator.OpenApi/ContentGeneratorBase.cs
@@ -98,7 +98,7 @@ protected static T InvokePreprocessors<T>(T data,
             return data;
         }
 
-        protected static TSettings ParseSettings(GeneratorContext context, IReadOnlyDictionary<string, string>? variables = null)
+        protected static TSettings ParseSettings(GeneratorContext context, IReadOnlyDictionary<string, string>? variables)
         {
             var unwrapProps = new[]
             {

diff --git a/src/ApiCodeGenerator.OpenApi/Converters/SettingsConverter.cs b/src/ApiCodeGenerator.OpenApi/Converters/SettingsConverter.cs
@@ -104,13 +104,19 @@ void FillProperties(object targetObject, params string[] unwrapProp)
                     {
                         var pos = Array.IndexOf(unwrapProp, p.Name);
                         if (pos > -1)
+                        {
                             forUnwrap[pos] = p;
+                        }
                         else
+                        {
                             props[p.Name] = (p, targetObject);
+                        }
                     }
 
                     foreach (var item in forUnwrap.Where(pi => pi != null))
+                    {
                         FillProperties(item.GetValue(targetObject), unwrapProp);
+                    }
                 }
             }
         }

diff --git a/src/ApiCodeGenerator.OpenApi/DefaultTemplateFactory.cs b/src/ApiCodeGenerator.OpenApi/DefaultTemplateFactory.cs
@@ -122,7 +122,7 @@ public interface ITemplateProvider
 {
     string? GetFullName(string name, string language);
 
-    string? GetTemplateText(string fullName, string language);
+    string? GetTemplateText(string templateFullName, string language);
 }
 
 [System.Diagnostics.CodeAnalysis.SuppressMessage("Ordering Rules", "SA1402", Justification = "none")]
@@ -145,9 +145,9 @@ public EmbededResourceTemplateProvider(Assembly assembly, string resourcePrefix)
             : null;
     }
 
-    public string? GetTemplateText(string resourceName, string language)
+    public string? GetTemplateText(string templateFullName, string language)
     {
-        var resource = _assembly.GetManifestResourceStream(resourceName);
+        var resource = _assembly.GetManifestResourceStream(templateFullName);
         if (resource != null)
         {
             using var reader = new StreamReader(resource);
@@ -181,11 +181,11 @@ public DirectoryTemplateProvider(string path)
         return null;
     }
 
-    public string? GetTemplateText(string templateFilePath, string language)
+    public string? GetTemplateText(string templateFullName, string language)
     {
-        if (File.Exists(templateFilePath))
+        if (File.Exists(templateFullName))
         {
-            return File.ReadAllText(templateFilePath);
+            return File.ReadAllText(templateFullName);
         }
 
         return null;

diff --git a/src/ApiCodeGenerator.OpenApi/Helpers/SettingsHelpers.cs b/src/ApiCodeGenerator.OpenApi/Helpers/SettingsHelpers.cs
@@ -23,15 +23,19 @@ public static void SetSpecialSettings(IExtensions? extensions, ClientGeneratorBa
         {
             var mode = ((JToken?)value)?.Value<string>();
             if (mode is not null)
+            {
                 SetOperationMode(extensions, settings, mode);
+            }
         }
         else if (propertyName.Equals("replaceNameCollection", StringComparison.OrdinalIgnoreCase))
         {
             if (((JToken?)value)?.Type == JTokenType.Object)
             {
                 var replacementData = ((JObject)value).ToObject<IDictionary<string, string>>();
                 if (replacementData is not null)
+                {
                     SetReplaceCollection(settings, replacementData);
+                }
             }
             else
             {

diff --git a/test/ApiCodeGenerator.Core.Tests/GeneratorTests.cs b/test/ApiCodeGenerator.Core.Tests/GeneratorTests.cs
@@ -172,7 +172,7 @@ public async Task RunCodeGeneration()
             Assert.True(result);
             Assert.NotNull(generatorMock.Object.Context);
             Assert.NotNull(generatorMock.Object.Context.DocumentReader);
-            Assert.NotNull(generatorMock.Object.Context.GetSettings<JObject>());
+            Assert.NotNull(generatorMock.Object.Context.GetSettings<JObject>(null, null));
             generatorMock.Verify(g => g.Generate(), Times.Once);
             _fileProviderMock.Verify(fp => fp.WriteAllTextAsync(It.Is<string>(v => v == OutFilePath), It.IsAny<string>()), Times.Once);
         }

diff --git a/test/ApiCodeGenerator.Core.Tests/Infrastructure/FakeCodeGenerator.cs b/test/ApiCodeGenerator.Core.Tests/Infrastructure/FakeCodeGenerator.cs
@@ -12,7 +12,7 @@ internal class FakeCodeGenerator : IContentGenerator
         public FakeCodeGenerator(GeneratorContext context, Dictionary<string, string>? additionalVars = null)
         {
             Context = context;
-            Settings = context.GetSettings<FakeCodeGeneratorSettings>(additionalVariables: additionalVars);
+            Settings = context.GetSettings<FakeCodeGeneratorSettings>(null, additionalVariables: additionalVars);
         }
 
         public GeneratorContext Context { get; }

diff --git a/test/ApiCodeGenerator.OpenApi.Tests/DefaultTemplateFactoryTests.cs b/test/ApiCodeGenerator.OpenApi.Tests/DefaultTemplateFactoryTests.cs
@@ -49,14 +49,14 @@ public TestTemplateProvider(string templateText)
             _templateText = templateText;
         }
 
-        public string? GetFullName(string name, string language)
+        string? ITemplateProvider.GetFullName(string name, string language)
         {
             return name == "Class"
                 ? $"{_providerKey}.{name}"
                 : null;
         }
 
-        public string? GetTemplateText(string name, string language)
+        string? ITemplateProvider.GetTemplateText(string name, string language)
         {
             if (name.StartsWith(_providerKey))
             {