Selaa lähdekoodia

Update to GenHTTP 4.1 (#6088)

* Update to GenHTTP 4.1

* Fix title not being rendered within Fortunes template
Andreas Nägeli 5 vuotta sitten
vanhempi
commit
3c66f4a776

+ 4 - 4
frameworks/CSharp/genhttp/Benchmarks/Benchmarks.csproj

@@ -28,10 +28,10 @@
   </ItemGroup>
     
   <ItemGroup>
-    <PackageReference Include="GenHTTP.Core" Version="3.2.2" />
-    <PackageReference Include="GenHTTP.Modules.Scriban" Version="3.2.2" />
-    <PackageReference Include="GenHTTP.Modules.Webservices" Version="3.2.2" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.8" />
+    <PackageReference Include="GenHTTP.Core" Version="4.1.0" />
+    <PackageReference Include="GenHTTP.Modules.Scriban" Version="4.1.0" />
+    <PackageReference Include="GenHTTP.Modules.Webservices" Version="4.1.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.9" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.4" />
   </ItemGroup>
   

+ 9 - 7
frameworks/CSharp/genhttp/Benchmarks/Program.cs

@@ -1,5 +1,7 @@
-using GenHTTP.Core;
-using GenHTTP.Modules.Core;
+using GenHTTP.Engine;
+
+using GenHTTP.Modules.IO;
+using GenHTTP.Modules.Layouting;
 using GenHTTP.Modules.Webservices;
 
 using Benchmarks.Tests;
@@ -15,11 +17,11 @@ namespace Benchmarks
             var tests = Layout.Create()
                               .Add("plaintext", Content.From("Hello, World!"))
                               .Add("fortunes", new FortuneHandlerBuilder())
-                              .Add<JsonResource>("json")
-                              .Add<DbResource>("db")
-                              .Add<QueryResource>("queries")
-                              .Add<UpdateResource>("updates")
-                              .Add<CacheResource>("cached-worlds");
+                              .AddService<JsonResource>("json")
+                              .AddService<DbResource>("db")
+                              .AddService<QueryResource>("queries")
+                              .AddService<UpdateResource>("updates")
+                              .AddService<CacheResource>("cached-worlds");
 
             return Host.Create()
                        .Handler(tests)

+ 1 - 1
frameworks/CSharp/genhttp/Benchmarks/Resources/Template.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>{{ title }}</title>
+    <title>{{ meta.title }}</title>
 </head>
 <body>
     {{ content }}

+ 2 - 2
frameworks/CSharp/genhttp/Benchmarks/Tests/CacheResource.cs

@@ -35,10 +35,10 @@ namespace Benchmarks.Tests
 
         }
 
-        [Method(":queries")]
+        [ResourceMethod(":queries")]
         public List<World> GetWorldsFromPath(string queries) => GetWorlds(queries);
 
-        [Method]
+        [ResourceMethod]
         public List<World> GetWorlds(string queries)
         {
             var count = 1;

+ 2 - 2
frameworks/CSharp/genhttp/Benchmarks/Tests/DbResource.cs

@@ -1,9 +1,9 @@
 using System;
+using System.Linq;
 
 using GenHTTP.Modules.Webservices;
 
 using Benchmarks.Model;
-using System.Linq;
 
 namespace Benchmarks.Tests
 {
@@ -12,7 +12,7 @@ namespace Benchmarks.Tests
     {
         private static Random _Random = new Random();
 
-        [Method]
+        [ResourceMethod]
         public World GetRandomWorld()
         {
             var id = _Random.Next(1, 10001);

+ 7 - 6
frameworks/CSharp/genhttp/Benchmarks/Tests/FortuneHandler.cs

@@ -1,13 +1,14 @@
-using Benchmarks.Model;
+using System.Collections.Generic;
+using System.Linq;
+
 using GenHTTP.Api.Content;
 using GenHTTP.Api.Content.Templating;
 using GenHTTP.Api.Protocol;
-using GenHTTP.Modules.Core;
+
+using GenHTTP.Modules.IO;
 using GenHTTP.Modules.Scriban;
-using Npgsql;
-using System;
-using System.Collections.Generic;
-using System.Linq;
+
+using Benchmarks.Model;
 
 namespace Benchmarks.Tests
 {

+ 1 - 1
frameworks/CSharp/genhttp/Benchmarks/Tests/JsonResource.cs

@@ -13,7 +13,7 @@ namespace Benchmarks.Tests
     public class JsonResource
     {
 
-        [Method]
+        [ResourceMethod]
         public JsonResult GetMessage() => new JsonResult() { Message = "Hello, World!" };
 
     }

+ 2 - 2
frameworks/CSharp/genhttp/Benchmarks/Tests/QueryResource.cs

@@ -13,10 +13,10 @@ namespace Benchmarks.Tests
     {
         private static Random _Random = new Random();
 
-        [Method(":queries")]
+        [ResourceMethod(":queries")]
         public List<World> GetWorldsFromPath(string queries) => GetWorlds(queries);
 
-        [Method]
+        [ResourceMethod]
         public List<World> GetWorlds(string queries)
         {
             var count = 1;

+ 7 - 5
frameworks/CSharp/genhttp/Benchmarks/Tests/UpdateResource.cs

@@ -1,9 +1,11 @@
-using Benchmarks.Model;
-using GenHTTP.Modules.Webservices;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
+using Benchmarks.Model;
+
+using GenHTTP.Modules.Webservices;
+
 namespace Benchmarks.Tests
 {
 
@@ -11,10 +13,10 @@ namespace Benchmarks.Tests
     {
         private static Random _Random = new Random();
 
-        [Method(":queries")]
+        [ResourceMethod(":queries")]
         public List<World> UpdateWorldsFromPath(string queries) => UpdateWorlds(queries);
 
-        [Method]
+        [ResourceMethod]
         public List<World> UpdateWorlds(string queries)
         {
             var count = 1;