Update packages, adjust for OpenAPI 2.0 (#674)

Kaliumhexacyanoferrat · web-flow · commit 0f0e2281fa75 · 2025-07-22T14:11:57.000+02:00
diff --git a/Engine/Internal/GenHTTP.Engine.Internal.csproj b/Engine/Internal/GenHTTP.Engine.Internal.csproj
@@ -15,7 +15,7 @@
 
         <ProjectReference Include="..\..\Modules\IO\GenHTTP.Modules.IO.csproj" />
 
-        <PackageReference Include="System.IO.Pipelines" Version="9.0.6" />
+        <PackageReference Include="System.IO.Pipelines" Version="9.0.7" />
 
     </ItemGroup>
 
diff --git a/Modules/Authentication/GenHTTP.Modules.Authentication.csproj b/Modules/Authentication/GenHTTP.Modules.Authentication.csproj
@@ -13,9 +13,9 @@
 
         <ProjectReference Include="..\Reflection\GenHTTP.Modules.Reflection.csproj" />
 
-        <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.12.1" />
+        <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.13.0" />
 
-        <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.12.1" />
+        <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.13.0" />
 
     </ItemGroup>
 
diff --git a/Modules/Basics/GenHTTP.Modules.Basics.csproj b/Modules/Basics/GenHTTP.Modules.Basics.csproj
@@ -11,7 +11,7 @@
 
         <ProjectReference Include="..\..\API\GenHTTP.Api.csproj" />
 
-        <PackageReference Include="System.Text.Json" Version="9.0.6" />
+        <PackageReference Include="System.Text.Json" Version="9.0.7" />
 
     </ItemGroup>
 
diff --git a/Modules/Caching/GenHTTP.Modules.Caching.csproj b/Modules/Caching/GenHTTP.Modules.Caching.csproj
@@ -13,7 +13,7 @@
 
         <ProjectReference Include="..\Basics\GenHTTP.Modules.Basics.csproj" />
 
-        <PackageReference Include="System.Text.Json" Version="9.0.6" />
+        <PackageReference Include="System.Text.Json" Version="9.0.7" />
 
     </ItemGroup>
 
diff --git a/Modules/Compression/GenHTTP.Modules.Compression.csproj b/Modules/Compression/GenHTTP.Modules.Compression.csproj
@@ -11,7 +11,7 @@
 
         <ProjectReference Include="..\..\API\GenHTTP.Api.csproj" />
 
-        <PackageReference Include="ZstdSharp.Port" Version="0.8.5" />
+        <PackageReference Include="ZstdSharp.Port" Version="0.8.6" />
 
     </ItemGroup>
 
diff --git a/Testing/Acceptance/AssertX.cs b/Testing/Acceptance/AssertX.cs
@@ -32,7 +32,7 @@ public static void DoesNotContain(string searchFor, string? content)
 
     public static void Single<T>(IEnumerable<T> collection) => Assert.IsTrue(collection.Count() == 1);
 
-    public static void Empty<T>(IEnumerable<T> collection) => Assert.IsFalse(collection.Any());
+    public static void Empty<T>(IEnumerable<T>? collection) => Assert.IsFalse(collection?.Any() ?? false);
 
     public static void Contains<T>(T value, IEnumerable<T> collection) => Assert.IsTrue(collection.Contains(value));
 
diff --git a/Testing/Acceptance/GenHTTP.Testing.Acceptance.csproj b/Testing/Acceptance/GenHTTP.Testing.Acceptance.csproj
@@ -33,8 +33,8 @@
 
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
 
-        <PackageReference Include="Microsoft.OpenApi" Version="1.6.24" />
-        <PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.24" />
+        <PackageReference Include="Microsoft.OpenApi" Version="2.0.0" />
+        <PackageReference Include="Microsoft.OpenApi.YamlReader" Version="2.0.0" />
 
         <PackageReference Include="MSTest" Version="3.9.3" />
 
diff --git a/Testing/Acceptance/Modules/OpenApi/ArgumentTests.cs b/Testing/Acceptance/Modules/OpenApi/ArgumentTests.cs
@@ -4,7 +4,7 @@
 using GenHTTP.Modules.IO;
 using GenHTTP.Modules.Reflection;
 
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -63,8 +63,8 @@ public async Task TestBodyParam(TestEngine engine)
 
         Assert.AreEqual("/users/filter", path.Item1);
 
-        Assert.IsTrue(operation.RequestBody.Content.ContainsKey("application/json"));
-        Assert.IsTrue(operation.RequestBody.Content.ContainsKey("text/xml"));
+        Assert.IsTrue(operation.RequestBody?.Content?.ContainsKey("application/json") ?? false);
+        Assert.IsTrue(operation.RequestBody?.Content?.ContainsKey("text/xml") ?? false);
     }
 
     [TestMethod]
@@ -78,7 +78,7 @@ public async Task TestContentParam(TestEngine engine)
 
         Assert.AreEqual("/users/filter", path.Item1);
 
-        Assert.IsTrue(operation.RequestBody.Content.ContainsKey("text/plain"));
+        Assert.IsTrue(operation.RequestBody?.Content?.ContainsKey("text/plain") ?? false);
     }
 
     [TestMethod]
@@ -92,8 +92,8 @@ public async Task TestStreamParam(TestEngine engine)
 
         Assert.AreEqual("/users/avatar", path.Item1);
 
-        Assert.IsTrue(operation.RequestBody.Content.ContainsKey("*/*"));
-        Assert.AreEqual("binary", operation.RequestBody.Content["*/*"].Schema.Format);
+        Assert.IsTrue(operation.RequestBody?.Content?.ContainsKey("*/*") ?? false);
+        Assert.AreEqual("binary", operation.RequestBody?.Content?["*/*"].Schema?.Format);
     }
 
     [TestMethod]
@@ -112,9 +112,11 @@ public async Task TestWildcardParameter(TestEngine engine)
 
     private static void AssertParameter(OpenApiOperation operation, string name, ParameterLocation location)
     {
-        Assert.AreEqual(1, operation.Parameters.Count);
+        Assert.AreEqual(1, operation.Parameters?.Count);
 
-        var param = operation.Parameters.First();
+        var param = operation.Parameters?.FirstOrDefault();
+
+        Assert.IsNotNull(param);
 
         Assert.AreEqual(name, param.Name);
         Assert.AreEqual(location, param.In);
diff --git a/Testing/Acceptance/Modules/OpenApi/DiscoveryTests.cs b/Testing/Acceptance/Modules/OpenApi/DiscoveryTests.cs
@@ -5,7 +5,7 @@
 using GenHTTP.Modules.Layouting;
 using GenHTTP.Modules.OpenApi;
 using GenHTTP.Modules.OpenApi.Discovery;
-using Microsoft.OpenApi.Models;
+
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using OpenApiDocument = NSwag.OpenApiDocument;
@@ -26,10 +26,10 @@ public async Task TestTraversal(TestEngine engine)
                         .AddRangeSupport()
                         .Add(ApiDescription.Create());
 
-        var doc = (await api.GetOpenApiAsync(engine)).OpenApiDocument;
+        var doc = (await api.GetOpenApiAsync(engine)).Document;
 
-        Assert.IsTrue(doc.Paths.ContainsKey("/service/method"));
-        Assert.IsTrue(doc.Paths.ContainsKey("/method2"));
+        Assert.IsTrue(doc?.Paths.ContainsKey("/service/method") ?? false);
+        Assert.IsTrue(doc?.Paths.ContainsKey("/method2") ?? false);
     }
 
     [TestMethod]
@@ -40,9 +40,9 @@ public async Task TestCustomExplorer(TestEngine engine)
 
         var api = Inline.Create().Add(ApiDescription.With(discovery));
 
-        var doc = (await api.GetOpenApiAsync(engine, false)).OpenApiDocument;
+        var doc = (await api.GetOpenApiAsync(engine, false)).Document;
 
-        Assert.AreEqual("Added by explorer", doc.Servers.First().Description);
+        Assert.AreEqual("Added by explorer", doc?.Servers?.First().Description);
     }
 
     [TestMethod]
@@ -54,16 +54,16 @@ public async Task TestSamePathWithDifferentMethods(TestEngine engine)
                         .Put("/method", (int i) => i)
                         .Add(ApiDescription.Create());
 
-        var doc = (await api.GetOpenApiAsync(engine)).OpenApiDocument;
+        var doc = (await api.GetOpenApiAsync(engine)).Document!;
 
-        Assert.AreEqual(1, doc.Paths.Count);
+        Assert.AreEqual(1, doc.Paths?.Count ?? 0);
 
-        var operations = doc.Paths.First().Value.Operations;
+        var operations = doc.Paths?.First().Value.Operations;
 
-        Assert.AreEqual(2, operations.Count);
+        Assert.AreEqual(2, operations?.Count ?? 0);
 
-        Assert.IsTrue(operations.ContainsKey(OperationType.Get));
-        Assert.IsTrue(operations.ContainsKey(OperationType.Put));
+        Assert.IsTrue(operations?.ContainsKey(HttpMethod.Get));
+        Assert.IsTrue(operations?.ContainsKey(HttpMethod.Put));
     }
 
     #region Supporting data structures
diff --git a/Testing/Acceptance/Modules/OpenApi/Extensions.cs b/Testing/Acceptance/Modules/OpenApi/Extensions.cs
@@ -1,22 +1,25 @@
 ﻿using System.Net;
+
 using GenHTTP.Api.Content;
+
 using GenHTTP.Modules.Functional.Provider;
 using GenHTTP.Modules.OpenApi;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers;
+
+using Microsoft.OpenApi;
+using Microsoft.OpenApi.Reader;
 
 namespace GenHTTP.Testing.Acceptance.Modules.OpenApi;
 
 internal static class Extensions
 {
 
-    internal static async Task<((string, OpenApiPathItem), OpenApiOperation)> GetOperationAsync(TestEngine engine, InlineBuilder api)
+    internal static async Task<((string, IOpenApiPathItem), OpenApiOperation)> GetOperationAsync(TestEngine engine, InlineBuilder api)
     {
-        var doc = (await api.Add(ApiDescription.Create()).GetOpenApiAsync(engine)).OpenApiDocument;
+        var doc = (await api.Add(ApiDescription.Create()).GetOpenApiAsync(engine)).Document!;
 
         var path = doc.Paths.First();
 
-        return ((path.Key, path.Value), path.Value.Operations.First().Value);
+        return ((path.Key, path.Value), path.Value.Operations?.First().Value!);
     }
 
     internal static async Task<ReadResult> AsOpenApiAsync(this HttpResponseMessage response)
@@ -25,7 +28,11 @@ internal static async Task<ReadResult> AsOpenApiAsync(this HttpResponseMessage r
 
         await using var content = await response.Content.ReadAsStreamAsync();
 
-        return await new OpenApiStreamReader().ReadAsync(content);
+        var settings = new OpenApiReaderSettings();
+
+        settings.AddYamlReader();
+
+        return await OpenApiDocument.LoadAsync(content, settings: settings);
     }
 
     internal static async Task<ReadResult> GetOpenApiAsync(this IHandlerBuilder api, TestEngine engine, bool validate = true)
@@ -38,8 +45,8 @@ internal static async Task<ReadResult> GetOpenApiAsync(this IHandlerBuilder api,
 
         if (validate)
         {
-            AssertX.Empty(result.OpenApiDiagnostic.Errors);
-            AssertX.Empty(result.OpenApiDiagnostic.Warnings);
+            AssertX.Empty(result.Diagnostic?.Errors);
+            AssertX.Empty(result.Diagnostic?.Warnings);
         }
 
         return result;
diff --git a/Testing/Acceptance/Modules/OpenApi/IntegrationTests.cs b/Testing/Acceptance/Modules/OpenApi/IntegrationTests.cs
@@ -20,9 +20,9 @@ public async Task TestWebserviceSupported(TestEngine engine)
                         .AddService<MyService>("my")
                         .Add(ApiDescription.Create());
 
-        var doc = (await api.GetOpenApiAsync(engine)).OpenApiDocument;
+        var doc = (await api.GetOpenApiAsync(engine)).Document;
 
-        Assert.AreEqual("/my/", doc.Paths.First().Key);
+        Assert.AreEqual("/my/", doc?.Paths.First().Key);
     }
 
     [TestMethod]
@@ -33,9 +33,9 @@ public async Task TestControllerSupported(TestEngine engine)
                         .AddController<MyController>("my")
                         .Add(ApiDescription.Create());
 
-        var doc = (await api.GetOpenApiAsync(engine)).OpenApiDocument;
+        var doc = (await api.GetOpenApiAsync(engine)).Document;
 
-        Assert.AreEqual("/my/method/", doc.Paths.First().Key);
+        Assert.AreEqual("/my/method/", doc?.Paths.First().Key);
     }
 
     [TestMethod]
@@ -46,9 +46,9 @@ public async Task TestInlineSupported(TestEngine engine)
                         .Get("/method", () => 42)
                         .Add(ApiDescription.Create());
 
-        var doc = (await api.GetOpenApiAsync(engine)).OpenApiDocument;
+        var doc = (await api.GetOpenApiAsync(engine)).Document;
 
-        Assert.AreEqual("/method", doc.Paths.First().Key);
+        Assert.AreEqual("/method", doc?.Paths.First().Key);
     }
 
     [TestMethod]
@@ -59,9 +59,9 @@ public async Task TestObsoleteOperation(TestEngine engine)
                         .AddService<ObsoleteService>("my")
                         .Add(ApiDescription.Create());
 
-        var doc = (await api.GetOpenApiAsync(engine)).OpenApiDocument;
+        var doc = (await api.GetOpenApiAsync(engine)).Document;
 
-        Assert.IsTrue(doc.Paths.First().Value.Operations.First().Value.Deprecated);
+        Assert.IsTrue(doc?.Paths.First().Value.Operations?.First().Value.Deprecated);
     }
 
     [TestMethod]
@@ -72,9 +72,9 @@ public async Task TestControllerWithMultipleMethods(TestEngine engine)
                         .AddController<MultipleMethodsController>("my")
                         .Add(ApiDescription.Create());
 
-        var doc = (await api.GetOpenApiAsync(engine)).OpenApiDocument;
+        var doc = (await api.GetOpenApiAsync(engine)).Document;
 
-        Assert.AreEqual(2, doc.Paths["/my/method/"].Operations.Count);
+        Assert.AreEqual(2, doc?.Paths?["/my/method/"].Operations?.Count);
     }
 
     #region Supporting data structures
diff --git a/Testing/Acceptance/Modules/OpenApi/MetaDataTests.cs b/Testing/Acceptance/Modules/OpenApi/MetaDataTests.cs
@@ -2,6 +2,7 @@
 using GenHTTP.Modules.Functional.Provider;
 using GenHTTP.Modules.OpenApi;
 using GenHTTP.Modules.OpenApi.Handler;
+
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace GenHTTP.Testing.Acceptance.Modules.OpenApi;
@@ -16,8 +17,8 @@ public async Task TestDefaultTitleAndVersion(TestEngine engine)
     {
         var doc = await GetApi(ApiDescription.Create()).GetOpenApiAsync(engine);
 
-        Assert.AreEqual("Swagger specification", doc.OpenApiDocument.Info.Title);
-        Assert.AreEqual("1.0.0", doc.OpenApiDocument.Info.Version);
+        Assert.AreEqual("Swagger specification", doc.Document?.Info.Title);
+        Assert.AreEqual("1.0.0", doc.Document?.Info.Version);
     }
 
     [TestMethod]
@@ -30,8 +31,8 @@ public async Task TestCustomTitleAndVersion(TestEngine engine)
 
         var doc = await GetApi(desc).GetOpenApiAsync(engine);
 
-        Assert.AreEqual("My Title", doc.OpenApiDocument.Info.Title);
-        Assert.AreEqual("2.0.1", doc.OpenApiDocument.Info.Version);
+        Assert.AreEqual("My Title", doc.Document?.Info.Title);
+        Assert.AreEqual("2.0.1", doc.Document?.Info.Version);
     }
 
     [TestMethod]
@@ -40,9 +41,9 @@ public async Task TestServerGenerated(TestEngine engine)
     {
         var doc = await GetApi(ApiDescription.Create()).GetOpenApiAsync(engine);
 
-        var server = doc.OpenApiDocument.Servers.First();
+        var server = doc.Document?.Servers?.First();
 
-        AssertX.Contains("http://localhost:", server.Url);
+        AssertX.Contains("http://localhost:", server?.Url);
     }
 
     [TestMethod]
@@ -54,7 +55,7 @@ public async Task TestPostProcessing(TestEngine engine)
 
         var doc = await GetApi(desc).GetOpenApiAsync(engine);
 
-        Assert.AreEqual("https://google.de/", doc.OpenApiDocument.Servers.First().Url);
+        Assert.AreEqual("https://google.de/", doc.Document?.Servers?.First().Url);
     }
 
     private static InlineBuilder GetApi(OpenApiConcernBuilder description)
diff --git a/Testing/Acceptance/Modules/OpenApi/ResponseTests.cs b/Testing/Acceptance/Modules/OpenApi/ResponseTests.cs
