Skip to content

Fix CA issues #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/ApiCodeGenerator.Abstraction/AssemblyResolver.cs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public static void Register(object? assemblyLoadContext)
{
var current = GetLoadContext();
var ev = assemblyLoadContextType.GetEvent("Resolving");
ev.AddEventHandler(current, new Func<object, AssemblyName, Assembly?>(AssemblyLoadContext_Resolving));
ev.AddEventHandler(current, AssemblyLoadContext_Resolving);
}
}

Expand All @@ -86,7 +86,7 @@ public static void Unregister()
{
var current = GetLoadContext();
var ev = assemblyLoadContextType.GetEvent("Resolving");
ev.RemoveEventHandler(current, new Func<object, AssemblyName, Assembly?>(AssemblyLoadContext_Resolving));
ev.RemoveEventHandler(current, AssemblyLoadContext_Resolving);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public async Task Generate_ChannelBindingSubscriber()
channelProperty.Value["bindings"] = JObject.FromObject(channelBinding); // add binding declaration
json["channels"] = new JObject { channelProperty }; // for test use only last channel

var context = new GeneratorContext((t, s, v) => settings, new Core.ExtensionManager.Extensions(), new Dictionary<string, string>())
var context = new GeneratorContext((_, _, _) => settings, new Core.ExtensionManager.Extensions(), new Dictionary<string, string>())
{
DocumentReader = new StringReader(json.ToString()),
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public async Task LoadApiDocument(string fileName)
var extensions = new Core.ExtensionManager.Extensions();

var context = new GeneratorContext(
settingsFactory: (t, s, v) => null,
settingsFactory: (_, _, _) => null,
extensions,
variables: new Dictionary<string, string>())
{
Expand Down Expand Up @@ -181,7 +181,7 @@ public async Task LoadApiDocument_WithExternalRef(string documentPath)
}

private static Func<Type, Newtonsoft.Json.JsonSerializer?, IReadOnlyDictionary<string, string>?, object?> GetSettingsFactory(string json)
=> (t, s, v) => (s ?? new()).Deserialize(new StringReader(json), t);
=> (t, s, _) => (s ?? new()).Deserialize(new StringReader(json), t);

private void ValidateDocument(AsyncApiDocument document)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public static GeneratorContext CreateContext(string settingsJson, string schemaF
var docReader = File.OpenText(GetAsyncApiPath(schemaFile));

return new GeneratorContext(
(t, s, v) => s!.Deserialize(jReader, t),
(t, s, _) => s!.Deserialize(jReader, t),
extensions ?? new(AcgExtension.CodeGenerators, GetOperationGenerators()),
new Dictionary<string, string>())
{
Expand Down Expand Up @@ -263,7 +263,7 @@ public static IReadOnlyDictionary<string, IReadOnlyCollection<Type>> GetOperatio

private static Task<IContentGenerator> CreateGenerator(TextReader document, CSharpClientGeneratorSettings settings)
{
var context = new GeneratorContext((t, s, v) => settings, new Core.ExtensionManager.Extensions(), new Dictionary<string, string>())
var context = new GeneratorContext((_, _, _) => settings, new Core.ExtensionManager.Extensions(), new Dictionary<string, string>())
{
DocumentReader = document,
};
Expand Down
2 changes: 1 addition & 1 deletion test/ApiCodeGenerator.Core.Tests/ExtensionLoaderTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public void LoadExtensions()
var extensions = ExtensionLoader.LoadExtensions(
[nameof(AcgExt1), nameof(AcgExt2)],
a => Assembly.GetCallingAssembly(),
(ap, asm) => GetType().GetNestedType(ap, BindingFlags.NonPublic) ?? throw new InvalidOperationException($"Type {ap} not found"));
(ap, _) => GetType().GetNestedType(ap, BindingFlags.NonPublic) ?? throw new InvalidOperationException($"Type {ap} not found"));

Assert.That(extensions.CodeGenerators, Does.ContainKey("gen1"));
Assert.AreEqual(new ContentGeneratorFactory(Gen1).Method, extensions.CodeGenerators["gen1"].Method);
Expand Down
2 changes: 1 addition & 1 deletion test/ApiCodeGenerator.Core.Tests/GeneratorTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ public async Task ApiDocumentLoadError()
var expectedError = $"Unable load OpenApi document from '{OpenApiFilePath}'";
var documentFactoryMock = new Mock<INswagDocumentFactory>();
documentFactoryMock.Setup(df => df.LoadNswagDocument(It.IsAny<string>(), It.IsAny<VariablesDict>(), null))
.Returns<string, VariablesDict, JObject?>((p, v, b) => LoadNswag(nswag, v));
.Returns<string, VariablesDict, JObject?>((_, v, _) => LoadNswag(nswag, v));

var extensions = new ExtensionManager.Extensions(
FakeGenerator());
Expand Down
2 changes: 1 addition & 1 deletion test/ApiCodeGenerator.OpenApi.Tests/FunctionalTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public async Task ReplaceCharsInNames_On(string schema, string replaceParams, st
var fileProviderMock = new Mock<IFileProvider>(MockBehavior.Strict);
fileProviderMock.Setup(f => f.Exists(It.IsAny<string>())).Returns(true);
fileProviderMock.Setup(p => p.WriteAllTextAsync(It.IsAny<string>(), It.IsAny<string>()))
.Callback<string, string>((path, content) => generatedText = content);
.Callback<string, string>((_, content) => generatedText = content);

var task = CreateGenerator(fileProviderMock, settingsJson, schema);

Expand Down
Loading