Some optimizations

Kaliumhexacyanoferrat · Kaliumhexacyanoferrat · commit 4e00bfa76ed1 · 2024-03-12T11:18:09.000+01:00
diff --git a/Modules/Controllers/Extensions.cs b/Modules/Controllers/Extensions.cs
@@ -3,6 +3,7 @@
 using GenHTTP.Api.Infrastructure;
 
 using GenHTTP.Modules.Controllers.Provider;
+using GenHTTP.Modules.Conversion.Formatters;
 using GenHTTP.Modules.Conversion.Providers;
 using GenHTTP.Modules.Layouting.Provider;
 using GenHTTP.Modules.Reflection.Injectors;
@@ -22,9 +23,9 @@ public static class Extensions
         /// <param name="path">The path that should be handled by the controller</param>
         /// <param name="injectors">Optionally the injectors to be used by this controller</param>
         /// <param name="formats">Optionally the formats to be used by this controller</param>
-        public static LayoutBuilder AddController<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(this LayoutBuilder builder, string path, IBuilder<InjectionRegistry>? injectors = null, IBuilder<SerializationRegistry>? formats = null) where T : new()
+        public static LayoutBuilder AddController<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(this LayoutBuilder builder, string path, IBuilder<InjectionRegistry>? injectors = null, IBuilder<SerializationRegistry>? serializers = null, IBuilder<FormatterRegistry>? formatters = null) where T : new()
         {
-            builder.Add(path, Controller.From<T>().Configured(injectors, formats));
+            builder.Add(path, Controller.From<T>().Configured(injectors, serializers, formatters));
             return builder;
         }
 
@@ -36,22 +37,27 @@ public static class Extensions
         /// <param name="builder">The layout the controller should be added to</param>
         /// <param name="injectors">Optionally the injectors to be used by this controller</param>
         /// <param name="formats">Optionally the formats to be used by this controller</param>
-        public static LayoutBuilder IndexController<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(this LayoutBuilder builder, IBuilder<InjectionRegistry>? injectors = null, IBuilder<SerializationRegistry>? formats = null) where T : new()
+        public static LayoutBuilder IndexController<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(this LayoutBuilder builder, IBuilder<InjectionRegistry>? injectors = null, IBuilder<SerializationRegistry>? serializers = null, IBuilder<FormatterRegistry>? formatters = null) where T : new()
         {
-            builder.Add(Controller.From<T>().Configured(injectors, formats));
+            builder.Add(Controller.From<T>().Configured(injectors, serializers, formatters));
             return builder;
         }
 
-        private static ControllerBuilder<T> Configured<T>(this ControllerBuilder<T> builder, IBuilder<InjectionRegistry>? injectors = null, IBuilder<SerializationRegistry>? formats = null) where T : new()
+        private static ControllerBuilder<T> Configured<T>(this ControllerBuilder<T> builder, IBuilder<InjectionRegistry>? injectors = null, IBuilder<SerializationRegistry>? serializers = null, IBuilder<FormatterRegistry>? formatters = null) where T : new()
         {
             if (injectors != null)
             {
                 builder.Injectors(injectors); 
             }
 
-            if (formats != null)
+            if (serializers != null)
             {
-                builder.Serializers(formats);
+                builder.Serializers(serializers);
+            }
+
+            if (formatters != null)
+            {
+                builder.Formatters(formatters);
             }
 
             return builder;
diff --git a/Modules/Functional/Provider/InlineBuilder.cs b/Modules/Functional/Provider/InlineBuilder.cs
@@ -8,9 +8,9 @@
 
 using GenHTTP.Modules.Conversion;
 using GenHTTP.Modules.Conversion.Providers;
+using GenHTTP.Modules.Conversion.Formatters;
 using GenHTTP.Modules.Reflection.Injectors;
 using GenHTTP.Modules.Reflection;
-using GenHTTP.Modules.Conversion.Formatters;
 
 namespace GenHTTP.Modules.Functional.Provider
 {
diff --git a/Modules/Webservices/Extensions.cs b/Modules/Webservices/Extensions.cs
@@ -1,7 +1,7 @@
 ﻿using System.Diagnostics.CodeAnalysis;
 
 using GenHTTP.Api.Infrastructure;
-
+using GenHTTP.Modules.Conversion.Formatters;
 using GenHTTP.Modules.Conversion.Providers;
 using GenHTTP.Modules.Layouting.Provider;
 using GenHTTP.Modules.Reflection.Injectors;
@@ -24,9 +24,9 @@ public static class Extensions
         /// <param name="path">The path the resource should be available at</param>
         /// <param name="injectors">Optionally the injectors to be used by this service</param>
         /// <param name="formats">Optionally the formats to be used by this service</param>
-        public static LayoutBuilder AddService<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(this LayoutBuilder layout, string path, IBuilder<InjectionRegistry>? injectors = null, IBuilder<SerializationRegistry>? formats = null) where T : new()
+        public static LayoutBuilder AddService<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(this LayoutBuilder layout, string path, IBuilder<InjectionRegistry>? injectors = null, IBuilder<SerializationRegistry>? serializers = null, IBuilder<FormatterRegistry>? formatters = null) where T : new()
         {
-            return layout.Add(path, ServiceResource.From<T>().Configured(injectors, formats));
+            return layout.Add(path, ServiceResource.From<T>().Configured(injectors, serializers, formatters));
         }
 
         /// <summary>
@@ -37,21 +37,26 @@ public static class Extensions
         /// <param name="instance">The webservice resource instance</param>
         /// <param name="injectors">Optionally the injectors to be used by this service</param>
         /// <param name="formats">Optionally the formats to be used by this service</param>
-        public static LayoutBuilder AddService(this LayoutBuilder layout, string path, object instance, IBuilder<InjectionRegistry>? injectors = null, IBuilder<SerializationRegistry>? formats = null)
+        public static LayoutBuilder AddService(this LayoutBuilder layout, string path, object instance, IBuilder<InjectionRegistry>? injectors = null, IBuilder<SerializationRegistry>? serializers = null, IBuilder<FormatterRegistry>? formatters = null)
         {
-            return layout.Add(path, ServiceResource.From(instance).Configured(injectors, formats));
+            return layout.Add(path, ServiceResource.From(instance).Configured(injectors, serializers, formatters));
         }
 
-        private static ServiceResourceBuilder Configured(this ServiceResourceBuilder builder, IBuilder<InjectionRegistry>? injectors = null, IBuilder<SerializationRegistry>? formats = null)
+        private static ServiceResourceBuilder Configured(this ServiceResourceBuilder builder, IBuilder<InjectionRegistry>? injectors = null, IBuilder<SerializationRegistry>? serializers = null, IBuilder<FormatterRegistry>? formatters = null)
         {
             if (injectors != null)
             {
                 builder.Injectors(injectors);
             }
 
-            if (formats != null)
+            if (serializers != null)
+            {
+                builder.Serializers(serializers);
+            }
+
+            if (formatters != null)
             {
-                builder.Serializers(formats);
+                builder.Formatters(formatters);
             }
 
             return builder;
diff --git a/Testing/Acceptance/Modules/Controllers/DataTests.cs b/Testing/Acceptance/Modules/Controllers/DataTests.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 
 using GenHTTP.Api.Protocol;
+
 using GenHTTP.Modules.Controllers;
 using GenHTTP.Modules.Conversion;
 using GenHTTP.Modules.Layouting;
@@ -80,7 +81,9 @@ public async Task TestInvalidDateOnly()
         private static TestHost GetHost()
         {
             var app = Layout.Create()
-                            .AddController<TestController>("t", formats: Serialization.Default(), injectors: Injection.Default());
+                            .AddController<TestController>("t", serializers: Serialization.Default(),
+                                                                injectors: Injection.Default(), 
+                                                                formatters: Formatting.Default());
 
             return TestHost.Run(app);
         }
diff --git a/Testing/Acceptance/Modules/Webservices/ResultTypeTests.cs b/Testing/Acceptance/Modules/Webservices/ResultTypeTests.cs
@@ -1,7 +1,9 @@
 ﻿using System.Net;
 using System.Threading.Tasks;
 
+using GenHTTP.Modules.Conversion;
 using GenHTTP.Modules.Layouting;
+using GenHTTP.Modules.Reflection;
 using GenHTTP.Modules.Webservices;
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
@@ -84,7 +86,9 @@ public async Task ControllerMayReturnGenericValueTask()
 
         private TestHost GetRunner()
         {
-            return TestHost.Run(Layout.Create().AddService<TestResource>("t"));
+            return TestHost.Run(Layout.Create().AddService<TestResource>("t", serializers: Serialization.Default(),
+                                                                              injectors: Injection.Default(),
+                                                                              formatters: Formatting.Default()));
         }
 
         #endregion

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`using GenHTTP.Api.Infrastructure;`
`4`	`4`
`5`	`5`	`using GenHTTP.Modules.Controllers.Provider;`
	`6`	`+using GenHTTP.Modules.Conversion.Formatters;`
`6`	`7`	`using GenHTTP.Modules.Conversion.Providers;`
`7`	`8`	`using GenHTTP.Modules.Layouting.Provider;`
`8`	`9`	`using GenHTTP.Modules.Reflection.Injectors;`
`@@ -22,9 +23,9 @@ public static class Extensions`
`22`	`23`	`/// <param name="path">The path that should be handled by the controller</param>`
`23`	`24`	`/// <param name="injectors">Optionally the injectors to be used by this controller</param>`
`24`	`25`	`/// <param name="formats">Optionally the formats to be used by this controller</param>`
`25`		`- public static LayoutBuilder AddController<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(this LayoutBuilder builder, string path, IBuilder<InjectionRegistry>? injectors = null, IBuilder<SerializationRegistry>? formats = null) where T : new()`
	`26`	`+ public static LayoutBuilder AddController<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(this LayoutBuilder builder, string path, IBuilder<InjectionRegistry>? injectors = null, IBuilder<SerializationRegistry>? serializers = null, IBuilder<FormatterRegistry>? formatters = null) where T : new()`
`26`	`27`	`{`
`27`		`- builder.Add(path, Controller.From<T>().Configured(injectors, formats));`
	`28`	`+ builder.Add(path, Controller.From<T>().Configured(injectors, serializers, formatters));`
`28`	`29`	`return builder;`
`29`	`30`	`}`
`30`	`31`
`@@ -36,22 +37,27 @@ public static class Extensions`
`36`	`37`	`/// <param name="builder">The layout the controller should be added to</param>`
`37`	`38`	`/// <param name="injectors">Optionally the injectors to be used by this controller</param>`
`38`	`39`	`/// <param name="formats">Optionally the formats to be used by this controller</param>`
`39`		`- public static LayoutBuilder IndexController<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(this LayoutBuilder builder, IBuilder<InjectionRegistry>? injectors = null, IBuilder<SerializationRegistry>? formats = null) where T : new()`
	`40`	`+ public static LayoutBuilder IndexController<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(this LayoutBuilder builder, IBuilder<InjectionRegistry>? injectors = null, IBuilder<SerializationRegistry>? serializers = null, IBuilder<FormatterRegistry>? formatters = null) where T : new()`
`40`	`41`	`{`
`41`		`- builder.Add(Controller.From<T>().Configured(injectors, formats));`
	`42`	`+ builder.Add(Controller.From<T>().Configured(injectors, serializers, formatters));`
`42`	`43`	`return builder;`
`43`	`44`	`}`
`44`	`45`
`45`		`- private static ControllerBuilder<T> Configured<T>(this ControllerBuilder<T> builder, IBuilder<InjectionRegistry>? injectors = null, IBuilder<SerializationRegistry>? formats = null) where T : new()`
	`46`	`+ private static ControllerBuilder<T> Configured<T>(this ControllerBuilder<T> builder, IBuilder<InjectionRegistry>? injectors = null, IBuilder<SerializationRegistry>? serializers = null, IBuilder<FormatterRegistry>? formatters = null) where T : new()`
`46`	`47`	`{`
`47`	`48`	`if (injectors != null)`
`48`	`49`	`{`
`49`	`50`	`builder.Injectors(injectors);`
`50`	`51`	`}`
`51`	`52`
`52`		`- if (formats != null)`
	`53`	`+ if (serializers != null)`
`53`	`54`	`{`
`54`		`- builder.Serializers(formats);`
	`55`	`+ builder.Serializers(serializers);`
	`56`	`+ }`
	`57`	`+`
	`58`	`+ if (formatters != null)`
	`59`	`+ {`
	`60`	`+ builder.Formatters(formatters);`
`55`	`61`	`}`
`56`	`62`
`57`	`63`	`return builder;`
Original file line number	Diff line number	Diff line change
`@@ -8,9 +8,9 @@`
`8`	`8`
`9`	`9`	`using GenHTTP.Modules.Conversion;`
`10`	`10`	`using GenHTTP.Modules.Conversion.Providers;`
	`11`	`+using GenHTTP.Modules.Conversion.Formatters;`
`11`	`12`	`using GenHTTP.Modules.Reflection.Injectors;`
`12`	`13`	`using GenHTTP.Modules.Reflection;`
`13`		`-using GenHTTP.Modules.Conversion.Formatters;`
`14`	`14`
`15`	`15`	`namespace GenHTTP.Modules.Functional.Provider`
`16`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System.Diagnostics.CodeAnalysis;`
`2`	`2`
`3`	`3`	`using GenHTTP.Api.Infrastructure;`
`4`		`-`
	`4`	`+using GenHTTP.Modules.Conversion.Formatters;`
`5`	`5`	`using GenHTTP.Modules.Conversion.Providers;`
`6`	`6`	`using GenHTTP.Modules.Layouting.Provider;`
`7`	`7`	`using GenHTTP.Modules.Reflection.Injectors;`
`@@ -24,9 +24,9 @@ public static class Extensions`
`24`	`24`	`/// <param name="path">The path the resource should be available at</param>`
`25`	`25`	`/// <param name="injectors">Optionally the injectors to be used by this service</param>`
`26`	`26`	`/// <param name="formats">Optionally the formats to be used by this service</param>`
`27`		`- public static LayoutBuilder AddService<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(this LayoutBuilder layout, string path, IBuilder<InjectionRegistry>? injectors = null, IBuilder<SerializationRegistry>? formats = null) where T : new()`
	`27`	`+ public static LayoutBuilder AddService<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(this LayoutBuilder layout, string path, IBuilder<InjectionRegistry>? injectors = null, IBuilder<SerializationRegistry>? serializers = null, IBuilder<FormatterRegistry>? formatters = null) where T : new()`
`28`	`28`	`{`
`29`		`- return layout.Add(path, ServiceResource.From<T>().Configured(injectors, formats));`
	`29`	`+ return layout.Add(path, ServiceResource.From<T>().Configured(injectors, serializers, formatters));`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`/// <summary>`
`@@ -37,21 +37,26 @@ public static class Extensions`
`37`	`37`	`/// <param name="instance">The webservice resource instance</param>`
`38`	`38`	`/// <param name="injectors">Optionally the injectors to be used by this service</param>`
`39`	`39`	`/// <param name="formats">Optionally the formats to be used by this service</param>`
`40`		`- public static LayoutBuilder AddService(this LayoutBuilder layout, string path, object instance, IBuilder<InjectionRegistry>? injectors = null, IBuilder<SerializationRegistry>? formats = null)`
	`40`	`+ public static LayoutBuilder AddService(this LayoutBuilder layout, string path, object instance, IBuilder<InjectionRegistry>? injectors = null, IBuilder<SerializationRegistry>? serializers = null, IBuilder<FormatterRegistry>? formatters = null)`
`41`	`41`	`{`
`42`		`- return layout.Add(path, ServiceResource.From(instance).Configured(injectors, formats));`
	`42`	`+ return layout.Add(path, ServiceResource.From(instance).Configured(injectors, serializers, formatters));`
`43`	`43`	`}`
`44`	`44`
`45`		`- private static ServiceResourceBuilder Configured(this ServiceResourceBuilder builder, IBuilder<InjectionRegistry>? injectors = null, IBuilder<SerializationRegistry>? formats = null)`
	`45`	`+ private static ServiceResourceBuilder Configured(this ServiceResourceBuilder builder, IBuilder<InjectionRegistry>? injectors = null, IBuilder<SerializationRegistry>? serializers = null, IBuilder<FormatterRegistry>? formatters = null)`
`46`	`46`	`{`
`47`	`47`	`if (injectors != null)`
`48`	`48`	`{`
`49`	`49`	`builder.Injectors(injectors);`
`50`	`50`	`}`
`51`	`51`
`52`		`- if (formats != null)`
	`52`	`+ if (serializers != null)`
	`53`	`+ {`
	`54`	`+ builder.Serializers(serializers);`
	`55`	`+ }`
	`56`	`+`
	`57`	`+ if (formatters != null)`
`53`	`58`	`{`
`54`		`- builder.Serializers(formats);`
	`59`	`+ builder.Formatters(formatters);`
`55`	`60`	`}`
`56`	`61`
`57`	`62`	`return builder;`