Simplified naming (#60)

Author: alefranz

.github/workflows/build.yml

@@ -5,6 +5,7 @@ on:
     branches: [ "main" ]
     tags: [ "**" ]
   pull_request:
+  workflow_dispatch:
 
 jobs:
 
@@ -38,7 +39,7 @@ jobs:
     needs: 
       - format
       - build
-    if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/')
+    if: github.event_name == 'workflow_dispatch' || (github.event_name == 'push' && startsWith(github.ref, 'refs/tags/'))
     steps:
     - name: Checkout
       uses: actions/checkout@v3

FunctionsValidationFilter.sln …onsOpenApiFluentValidationExtensions.slnFunctionsValidationFilter.sln renamed to AzureFunctionsOpenApiFluentValidationExtensions.sln FunctionsValidationFilter.sln renamed to AzureFunctionsOpenApiFluentValidationExtensions.sln

@@ -10,11 +10,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8E7F3B16-8C1
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{4548709D-6DFA-4CE9-A6EF-F20F2D210057}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionsValidationFilter.Tests", "test\FunctionsValidationFilter.Tests\FunctionsValidationFilter.Tests.csproj", "{4314B709-63A3-466F-B849-47141DADD1CC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureFunctionsOpenApiFluentValidationExtensions.Tests", "test\AzureFunctionsOpenApiFluentValidationExtensions.Tests\AzureFunctionsOpenApiFluentValidationExtensions.Tests.csproj", "{4314B709-63A3-466F-B849-47141DADD1CC}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionsValidationFilter", "src\FunctionsValidationFilter\FunctionsValidationFilter.csproj", "{5AB4FFC0-D80D-41CC-A5A2-A1099B0285DB}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureFunctionsOpenApiFluentValidationExtensions", "src\AzureFunctionsOpenApiFluentValidationExtensions\AzureFunctionsOpenApiFluentValidationExtensions.csproj", "{5AB4FFC0-D80D-41CC-A5A2-A1099B0285DB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionsValidationFilter.DependencyInjection", "src\FunctionsValidationFilter.DependencyInjection\FunctionsValidationFilter.DependencyInjection.csproj", "{B1B902B8-EB41-413A-B96B-DAE971DAF11C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AzureFunctionsOpenApiFluentValidationExtensions.DependencyInjection", "src\AzureFunctionsOpenApiFluentValidationExtensions.DependencyInjection\AzureFunctionsOpenApiFluentValidationExtensions.DependencyInjection.csproj", "{B1B902B8-EB41-413A-B96B-DAE971DAF11C}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0AA753A4-10D9-4E0E-B224-172CF16E3685}"
 	ProjectSection(SolutionItems) = preProject

Directory.Build.props

@@ -4,7 +4,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>10</LangVersion>
-    <AssemblyName>NewDay.Extensions.$(MSBuildProjectName)</AssemblyName>
+    <AssemblyName>$(MSBuildProjectName)</AssemblyName>
     <RootNamespace>$(AssemblyName.Replace(" ", "_"))</RootNamespace>
   </PropertyGroup>
 

README.md

@@ -1,4 +1,4 @@
-# FunctionsValidationFilter
+# AzureFunctionsOpenApiFluentValidationExtensions
 
 Decorates the [OpenApi Specification](https://swagger.io/specification/) generated using [Azure Functions OpenAPI Extension](https://github.com/Azure/azure-functions-openapi-extension) with [FluentValidation](https://docs.fluentvalidation.net/en/latest/) rules loaded at runtime.
 
@@ -17,32 +17,32 @@ Currently, only basic rules are supported and the regex dialect is not translate
 Add to your project:
 
 ```xml
-<PackageReference Include="NewDay.Extensions.FunctionsValidationFilter.DependencyInjection" Version="0.1.19" />
+<PackageReference Include="AzureFunctionsOpenApiFluentValidationExtensions.DependencyInjection" Version="0.1.19" />
 ```
 
 Add to your OpenApi configuration:
 
 ```csharp
-DocumentFilters.AddFunctionsValidationFilter<Startup>();
+DocumentFilters.AddAzureFunctionsOpenApiFluentValidationExtensions<Startup>();
 ```
 
 ## Usage
 
 Add to your project:
 
 ```xml
-<PackageReference Include="NewDay.Extensions.FunctionsValidationFilter.DependencyInjection" Version="0.1.19" />
+<PackageReference Include="AzureFunctionsOpenApiFluentValidationExtensions.DependencyInjection" Version="0.1.19" />
 ```
 
-In your custom object to define the OpenApi configuration, use `AddFunctionsValidationFilter` on the `DocumentFilters` property.
+In your custom object to define the OpenApi configuration, use `AddAzureFunctionsOpenApiFluentValidationExtensions` on the `DocumentFilters` property.
 
 ```csharp
 public class OpenApiConfigurationOptions : DefaultOpenApiConfigurationOptions
 {
     public OpenApiConfigurationOptions()
     {
         // Add all validators via reflection.
-        DocumentFilters.AddFunctionsValidationFilter<Startup>(services =>
+        DocumentFilters.AddAzureFunctionsOpenApiFluentValidationExtensions<Startup>(services =>
         {
             // Add dependencies required to build the validators.
             // Note the OpenAPI generator doesn't use the DI container.
@@ -70,7 +70,7 @@ public class OpenApiConfigurationOptions : DefaultOpenApiConfigurationOptions
 Add to your project:
 
 ```xml
-<PackageReference Include="NewDay.Extensions.FunctionsValidationFilter" Version="0.1.19" />
+<PackageReference Include="AzureFunctionsOpenApiFluentValidationExtensions" Version="0.1.19" />
 ```
 
 If you are not using DI in Azure Functions or using static Functions, you would need to manually register all the validators you are using.
@@ -107,10 +107,10 @@ public class OpenApiConfigurationOptions : DefaultOpenApiConfigurationOptions
 
 ### Handling new rules
 
-1. Implement a new rule in [`FunctionsValidationFilter.Rules`](https://github.com/NewDayTechnology/NewDay.Extensions.FunctionsValidationFilter/tree/main/src/FunctionsValidationFilter/Rules) that extend [`Rule`](https://github.com/NewDayTechnology/NewDay.Extensions.FunctionsValidationFilter/blob/main/src/FunctionsValidationFilter/Rules/Rule.cs) and define the required properties. This represents an internal representation of a rule.
+1. Implement a new rule in [`AzureFunctionsOpenApiFluentValidationExtensions.Rules`](https://github.com/NewDayTechnology/AzureFunctionsOpenApiFluentValidationExtensions/tree/main/src/AzureFunctionsOpenApiFluentValidationExtensions/Rules) that extend [`Rule`](https://github.com/NewDayTechnology/AzureFunctionsOpenApiFluentValidationExtensions/blob/main/src/AzureFunctionsOpenApiFluentValidationExtensions/Rules/Rule.cs) and define the required properties. This represents an internal representation of a rule.
 
-1. Add a new case in [`FunctionsValidationFilter.ValidatorMapper`](https://github.com/NewDayTechnology/NewDay.Extensions.FunctionsValidationFilter/blob/main/src/FunctionsValidationFilter/ValidatorMapper.cs) that map from a `FluentValidation` type of a rule to the new modeled rule.
+1. Add a new case in [`AzureFunctionsOpenApiFluentValidationExtensions.ValidatorMapper`](https://github.com/NewDayTechnology/AzureFunctionsOpenApiFluentValidationExtensions/blob/main/src/AzureFunctionsOpenApiFluentValidationExtensions/ValidatorMapper.cs) that map from a `FluentValidation` type of a rule to the new modeled rule.
 
-1. Extend [`FunctionsValidationFilter.FunctionsValidationDocumentFilter`](https://github.com/NewDayTechnology/NewDay.Extensions.FunctionsValidationFilter/blob/main/src/FunctionsValidationFilter/FunctionsValidationDocumentFilter.cs):
+1. Extend [`AzureFunctionsOpenApiFluentValidationExtensions.FunctionsValidationDocumentFilter`](https://github.com/NewDayTechnology/AzureFunctionsOpenApiFluentValidationExtensions/blob/main/src/AzureFunctionsOpenApiFluentValidationExtensions/FunctionsValidationDocumentFilter.cs):
     1. Add a new case in the `ApplySchemas` method for the new rule to set the necessary properties of a field of a schema, based on the rule.
     1. Add a new case in the `ApplySchemasToOperations` method for the new rule to set the necessary properties of a parameter of an operation, based on the rule.

sample/SampleFunctionApp/Program.cs

@@ -22,7 +22,7 @@
                     {
                         Name = "sample",
                         Email = "test@example.com",
-                        Url = new Uri("https://github.com/NewDayTechnology/NewDay.Extensions.FunctionsValidationFilter"),
+                        Url = new Uri("https://github.com/NewDayTechnology/AzureFunctionsOpenApiFluentValidationExtensions"),
                     },
                     License = new OpenApiLicense()
                     {
@@ -37,7 +37,7 @@
                 ForceHttp = DefaultOpenApiConfigurationOptions.IsHttpForced(),
             };
 
-            options.DocumentFilters.AddFunctionsValidationFilter<Program>();
+            options.DocumentFilters.AddAzureFunctionsOpenApiFluentValidationExtensions<Program>();
 
             return options;
         });

sample/SampleFunctionApp/SampleFunctionApp.csproj

@@ -15,8 +15,8 @@
     <PackageReference Include="FluentValidation" Version="11.4.0" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\FunctionsValidationFilter.DependencyInjection\FunctionsValidationFilter.DependencyInjection.csproj" />
-    <ProjectReference Include="..\..\src\FunctionsValidationFilter\FunctionsValidationFilter.csproj" />
+    <ProjectReference Include="..\..\src\AzureFunctionsOpenApiFluentValidationExtensions.DependencyInjection\AzureFunctionsOpenApiFluentValidationExtensions.DependencyInjection.csproj" />
+    <ProjectReference Include="..\..\src\AzureFunctionsOpenApiFluentValidationExtensions\AzureFunctionsOpenApiFluentValidationExtensions.csproj" />
   </ItemGroup>
   <ItemGroup>
     <None Update="host.json">

sample/SampleFunctionApp/SampleInputValidator.cs

@@ -1,7 +1,7 @@
 using FluentValidation;
 using SampleFunctionApp;
 
-namespace NewDay.Extensions.SampleFunctionApp;
+namespace SampleFunctionApp;
 
 public class SampleInputValidator : AbstractValidator<SampleInput>
 {

…idationFilter.DependencyInjection.csproj …ionExtensions.DependencyInjection.csprojsrc/FunctionsValidationFilter.DependencyInjection/FunctionsValidationFilter.DependencyInjection.csproj renamed to src/AzureFunctionsOpenApiFluentValidationExtensions.DependencyInjection/AzureFunctionsOpenApiFluentValidationExtensions.DependencyInjection.csproj src/FunctionsValidationFilter.DependencyInjection/FunctionsValidationFilter.DependencyInjection.csproj renamed to src/AzureFunctionsOpenApiFluentValidationExtensions.DependencyInjection/AzureFunctionsOpenApiFluentValidationExtensions.DependencyInjection.csproj

@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\FunctionsValidationFilter\FunctionsValidationFilter.csproj" />
+    <ProjectReference Include="..\AzureFunctionsOpenApiFluentValidationExtensions\AzureFunctionsOpenApiFluentValidationExtensions.csproj" />
   </ItemGroup>
 
 </Project>

…OpenApiConfigurationOptionsExtensions.cs …OpenApiConfigurationOptionsExtensions.cssrc/FunctionsValidationFilter.DependencyInjection/OpenApiConfigurationOptionsExtensions.cs renamed to src/AzureFunctionsOpenApiFluentValidationExtensions.DependencyInjection/OpenApiConfigurationOptionsExtensions.cs src/FunctionsValidationFilter.DependencyInjection/OpenApiConfigurationOptionsExtensions.cs renamed to src/AzureFunctionsOpenApiFluentValidationExtensions.DependencyInjection/OpenApiConfigurationOptionsExtensions.cs

@@ -1,9 +1,9 @@
 using System.Diagnostics;
+using AzureFunctionsOpenApiFluentValidationExtensions;
 using FluentValidation;
 using Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Abstractions;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
-using NewDay.Extensions.FunctionsValidationFilter;
 
 namespace Microsoft.Azure.WebJobs.Extensions.OpenApi.Core.Configurations;
 
@@ -17,7 +17,7 @@ public static class OpenApiConfigurationOptionsExtensions
     /// </summary>
     /// <typeparam name="T">The Startup type, to be used to determine the assembly in which to discover the FluentValidation validators.</typeparam>
     /// <param name="filters">The <see cref="List{IDocumentFilter}"/> filters.</param>
-    public static void AddFunctionsValidationFilter<T>(this List<IDocumentFilter> filters)
+    public static void AddAzureFunctionsOpenApiFluentValidationExtensions<T>(this List<IDocumentFilter> filters)
     {
         filters.Add(Build<T>());
     }
@@ -29,7 +29,7 @@ public static void AddFunctionsValidationFilter<T>(this List<IDocumentFilter> fi
     /// <param name="filters">The <see cref="List{IDocumentFilter}"/> filters.</param>
     /// <param name="configureServices">A lambda to configure the ServiceCollection with extra services required to construct the FluentValidation validators.</param>
 
-    public static void AddFunctionsValidationFilter<T>(this List<IDocumentFilter> filters, Action<ServiceCollection> configureServices)
+    public static void AddAzureFunctionsOpenApiFluentValidationExtensions<T>(this List<IDocumentFilter> filters, Action<ServiceCollection> configureServices)
     {
         filters.Add(Build<T>(configureServices));
     }
@@ -39,8 +39,8 @@ public static void AddFunctionsValidationFilter<T>(this List<IDocumentFilter> fi
     /// </summary>
     /// <typeparam name="T">The Startup type, to be used to determine the assembly in which to discover the FluentValidation validators.</typeparam>
     /// <param name="filters">The <see cref="List{IDocumentFilter}"/> filters.</param>
-    /// <param name="configureOptions">A lambda to configure the options of FunctionsValidationFilter.</param>
-    public static void AddFunctionsValidationFilter<T>(this List<IDocumentFilter> filters, Action<FunctionsValidationFilterOptions> configureOptions)
+    /// <param name="configureOptions">A lambda to configure the options of AzureFunctionsOpenApiFluentValidationExtensions.</param>
+    public static void AddAzureFunctionsOpenApiFluentValidationExtensions<T>(this List<IDocumentFilter> filters, Action<AzureFunctionsOpenApiFluentValidationExtensionsOptions> configureOptions)
     {
         filters.Add(Build<T>(configureOptions: configureOptions));
     }
@@ -51,24 +51,24 @@ public static void AddFunctionsValidationFilter<T>(this List<IDocumentFilter> fi
     /// <typeparam name="T">The Startup type, to be used to determine the assembly in which to discover the FluentValidation validators.</typeparam>
     /// <param name="filters">The <see cref="List{IDocumentFilter}"/> filters.</param>
     /// <param name="configureServices">A lambda to configure the ServiceCollection with extra services required to construct the FluentValidation validators.</param>
-    /// <param name="configureOptions">A lambda to configure the options of FunctionsValidationFilter.</param>
-    public static void AddFunctionsValidationFilter<T>(this List<IDocumentFilter> filters, Action<ServiceCollection> configureServices, Action<FunctionsValidationFilterOptions> configureOptions)
+    /// <param name="configureOptions">A lambda to configure the options of AzureFunctionsOpenApiFluentValidationExtensions.</param>
+    public static void AddAzureFunctionsOpenApiFluentValidationExtensions<T>(this List<IDocumentFilter> filters, Action<ServiceCollection> configureServices, Action<AzureFunctionsOpenApiFluentValidationExtensionsOptions> configureOptions)
     {
         filters.Add(Build<T>(configureServices, configureOptions));
     }
 
-    private static FunctionsValidationDocumentFilter Build<T>(Action<ServiceCollection>? configureServices = null, Action<FunctionsValidationFilterOptions>? configureOptions = null)
+    private static FunctionsValidationDocumentFilter Build<T>(Action<ServiceCollection>? configureServices = null, Action<AzureFunctionsOpenApiFluentValidationExtensionsOptions>? configureOptions = null)
     {
         var services = new ServiceCollection();
         AddValidators<T>(services);
         configureServices?.Invoke(services);
-        services.AddOptions<FunctionsValidationFilterOptions>();
+        services.AddOptions<AzureFunctionsOpenApiFluentValidationExtensionsOptions>();
         if (configureOptions is not null) services.Configure(configureOptions);
 
         using var serviceProvider = services.BuildServiceProvider();
 
         var validators = GetValidators(services, serviceProvider);
-        var options = serviceProvider.GetRequiredService<IOptions<FunctionsValidationFilterOptions>>();
+        var options = serviceProvider.GetRequiredService<IOptions<AzureFunctionsOpenApiFluentValidationExtensionsOptions>>();
         var schemaMapper = new SchemaMapper(new RulesMapper(new ValidatorMapper()));
 
         return new FunctionsValidationDocumentFilter(schemaMapper, validators, options.Value);