OpenAPI broke

Author: hhvrc

Common/DataAnnotations/EmailAddressAttribute.cs

@@ -1,7 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.Net.Mail;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using OpenShock.Common.Constants;
 using OpenShock.Common.DataAnnotations.Interfaces;
 
@@ -13,7 +12,7 @@ namespace OpenShock.Common.DataAnnotations;
 /// <remarks>
 /// Inherits from <see cref="ValidationAttribute"/>.
 /// </remarks>
-[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = false)]
+[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter)]
 public sealed class EmailAddressAttribute : ValidationAttribute, IParameterAttribute
 {
     /// <summary>
@@ -61,7 +60,7 @@ public void Apply(OpenApiSchema schema)
     {
         //if (ShouldValidate) schema.Pattern = ???;
 
-        schema.Example = new OpenApiString(ExampleValue);
+        schema.Example = ExampleValue;
     }
 
     /// <inheritdoc/>

Common/DataAnnotations/Interfaces/IOperationAttribute.cs

@@ -1,4 +1,4 @@
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 
 namespace OpenShock.Common.DataAnnotations.Interfaces;
 

Common/DataAnnotations/Interfaces/IParameterAttribute.cs

@@ -1,4 +1,4 @@
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 
 namespace OpenShock.Common.DataAnnotations.Interfaces;
 

Common/DataAnnotations/OpenApiSchemas.cs

@@ -1,21 +1,22 @@
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using OpenShock.Common.Models;
 
 namespace OpenShock.Common.DataAnnotations;
 
 public static class OpenApiSchemas
 {
-    public static OpenApiSchema SemVerSchema => new OpenApiSchema {
+    public static OpenApiSchema SemVerSchema => new()
+    {
         Title = "SemVer",
-        Type = "string",
-        Pattern = /* lang=regex */ "^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$",
-        Example = new OpenApiString("1.0.0-dev+a16f2")
+        Type = JsonSchemaType.String,
+        Pattern = /* lang=regex */ @"^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$",
+        Example = "1.0.0-dev+a16f2"
     };
 
-    public static OpenApiSchema PauseReasonEnumSchema => new OpenApiSchema {
+    public static OpenApiSchema PauseReasonEnumSchema => new()
+    {
         Title = nameof(PauseReason),
-        Type = "integer",
+        Type = JsonSchemaType.Integer,
         Description = """
             An integer representing the reason(s) for the shocker being paused, expressed as a bitfield where reasons are OR'd together.
 
@@ -26,6 +27,6 @@ public static class OpenApiSchemas
 
             For example, a value of 6 (2 | 4) indicates both 'UserShare' and 'PublicShare' reasons.
             """,
-        Example = new OpenApiInteger(6)
+        Example = 6
     };
 }

Common/DataAnnotations/PasswordAttribute.cs

@@ -1,6 +1,5 @@
 using System.ComponentModel.DataAnnotations;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using OpenShock.Common.Constants;
 using OpenShock.Common.DataAnnotations.Interfaces;
 
@@ -12,7 +11,7 @@ namespace OpenShock.Common.DataAnnotations;
 /// <remarks>
 /// Inherits from <see cref="ValidationAttribute"/>.
 /// </remarks>
-[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = false)]
+[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter)]
 public sealed class PasswordAttribute : ValidationAttribute, IParameterAttribute
 {
     /// <summary>
@@ -60,7 +59,7 @@ public void Apply(OpenApiSchema schema)
     {
         //if (ShouldValidate) schema.Pattern = ???;
 
-        schema.Example = new OpenApiString(ExampleValue);
+        schema.Example = ExampleValue;
     }
 
     /// <inheritdoc/>

Common/DataAnnotations/UsernameAttribute.cs

@@ -1,6 +1,5 @@
 using System.ComponentModel.DataAnnotations;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using OpenShock.Common.DataAnnotations.Interfaces;
 using OpenShock.Common.Validation;
 
@@ -12,7 +11,7 @@ namespace OpenShock.Common.DataAnnotations;
 /// <remarks>
 /// Inherits from <see cref="ValidationAttribute"/>.
 /// </remarks>
-[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = false)]
+[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter)]
 public sealed class UsernameAttribute : ValidationAttribute, IParameterAttribute
 {
     /// <summary>
@@ -56,7 +55,7 @@ public void Apply(OpenApiSchema schema)
     {
         //if (ShouldValidate) schema.Pattern = ???;
 
-        schema.Example = new OpenApiString(ExampleValue);
+        schema.Example = ExampleValue;
     }
 
     /// <inheritdoc/>

Common/Swagger/AttributeFilter.cs

@@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using OpenShock.Common.Authentication;
 using OpenShock.Common.DataAnnotations.Interfaces;
 using Swashbuckle.AspNetCore.SwaggerGen;
@@ -8,7 +8,7 @@ namespace OpenShock.Common.Swagger;
 
 public sealed class AttributeFilter : ISchemaFilter, IParameterFilter, IOperationFilter
 {
-    public void Apply(OpenApiParameter parameter, ParameterFilterContext context)
+    public void Apply(IOpenApiParameter parameter, ParameterFilterContext context)
     {
         // Apply OpenShock Parameter Attributes
         foreach (var attribute in context.ParameterInfo?.GetCustomAttributes(true).OfType<IParameterAttribute>() ?? [])
@@ -23,7 +23,7 @@ public void Apply(OpenApiParameter parameter, ParameterFilterContext context)
         }
     }
 
-    public void Apply(OpenApiSchema schema, SchemaFilterContext context)
+    public void Apply(IOpenApiSchema schema, SchemaFilterContext context)
     {
         // Apply OpenShock Parameter Attributes
         foreach (var attribute in context.MemberInfo?.GetCustomAttributes(true).OfType<IParameterAttribute>() ?? [])

Common/Swagger/SwaggerGenExtensions.cs

@@ -1,4 +1,4 @@
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using OpenShock.Common.Constants;
 using OpenShock.Common.DataAnnotations;
 using OpenShock.Common.Models;

Common/Utils/ConfigureSwaggerOptions.cs

@@ -1,6 +1,6 @@
 using Asp.Versioning.ApiExplorer;
 using Microsoft.Extensions.Options;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
 namespace OpenShock.Common.Utils;