Complete the transformation to a middleware (#77)

Finish transformation to more generic middleware.
cognitedata · Mar 4, 2021 · 53e8b62 · 53e8b62
1 parent 795811c
commit 53e8b62
Show file tree

Hide file tree

Showing 31 changed files with 1,860 additions and 1,090 deletions.
diff --git a/README.md b/README.md
diff --git a/examples/github/GitHub.fsproj b/examples/github/GitHub.fsproj
@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk.Web">
-    <PropertyGroup>
-        <OutputType>Exe</OutputType>
-        <TargetFramework>net5</TargetFramework>
-    </PropertyGroup>
-    <ItemGroup>
-        <PackageReference Include="Oryx" Version="3.0.0-beta-001" />
-        <PackageReference Include="Oryx.ThothJsonNet" Version="3.0.0-beta-001" />
-        <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
-        <PackageReference Include="Ply" Version="0.3.1" />
-    </ItemGroup>
-    <ItemGroup>
-        <Compile Include="Program.fs" />
-    </ItemGroup>
-</Project>
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Program.fs" />
+  </ItemGroup>
+  <Import Project="..\..\.paket\Paket.Restore.targets" />
+</Project>
diff --git a/examples/github/Program.fs b/examples/github/Program.fs
@@ -2,7 +2,7 @@ open Oryx
 open System.Net.Http
 open Oryx.ThothJsonNet.ResponseReader
 open Thoth.Json.Net
-open FSharp.Control.Tasks.ContextInsensitive
+open FSharp.Control.Tasks
 
 [<EntryPoint>]
 let main argv =

diff --git a/examples/github/paket.references b/examples/github/paket.references
@@ -0,0 +1,6 @@
+group Examples
+
+Thoth.Json.Net
+Oryx
+Oryx.ThothJsonNet
+Newtonsoft.Json
diff --git a/examples/wikisearch/Program.fs b/examples/wikisearch/Program.fs
@@ -39,8 +39,8 @@ let asyncMain argv =
         use client = new HttpClient()
 
         let ctx =
-            Context.defaultContext
-            |> Context.withHttpClient client
+            HttpContext.defaultContext
+            |> HttpContext.withHttpClient client
 
         let! result = request "F#" |> runAsync ctx
         printfn "Result: %A" result

diff --git a/extensions/Oryx.NewtonsoftJson/ResponseReader.fs b/extensions/Oryx.NewtonsoftJson/ResponseReader.fs
@@ -12,7 +12,7 @@ module ResponseReader =
     /// </summary>
     /// <param name="decoder">Decoder to use. </param>
     /// <returns>Decoded context.</returns>
-    let json<'TResult> : HttpHandler<HttpContent, 'TResult> =
+    let json<'TResult> : IHttpHandler<HttpContent, 'TResult> =
 
         let parser (stream: Stream) =
             use sr = new StreamReader(stream)

diff --git a/extensions/Oryx.SystemTextJson/ResponseReader.fs b/extensions/Oryx.SystemTextJson/ResponseReader.fs
@@ -12,7 +12,7 @@ module ResponseReader =
     /// </summary>
     /// <param name="options">JSON serializer options to use. </param>
     /// <returns>Decoded context.</returns>
-    let json<'TResult> (options: JsonSerializerOptions) : HttpHandler<HttpContent, 'TResult> =
+    let json<'TResult> (options: JsonSerializerOptions) : IHttpHandler<HttpContent, 'TResult> =
         let parser stream =
             (JsonSerializer.DeserializeAsync<'TResult>(stream, options))
                 .AsTask()

diff --git a/extensions/Oryx.ThothJsonNet/ResponseReader.fs b/extensions/Oryx.ThothJsonNet/ResponseReader.fs
@@ -18,7 +18,7 @@ module ResponseReader =
     /// </summary>
     /// <param name="decoder">Decoder to use. </param>
     /// <returns>Decoded context.</returns>
-    let json<'TResult> (decoder: Decoder<'TResult>) : HttpHandler<HttpContent, 'TResult> =
+    let json<'TResult> (decoder: Decoder<'TResult>) : IHttpHandler<HttpContent, 'TResult> =
         let parser (stream: Stream) : Task<'TResult> =
             task {
                 let! ret = decodeStreamAsync decoder stream

diff --git a/paket.dependencies b/paket.dependencies
@@ -68,4 +68,7 @@ group Examples
     storage: none
 
     nuget Ply
-    nuget Thoth.Json.Net
+    nuget Thoth.Json.Net
+    nuget Oryx prerelease
+    nuget Oryx.ThothJsonNet prerelease
+    nuget Newtonsoft.Json
diff --git a/paket.lock b/paket.lock
diff --git a/src/Builder.fs b/src/Builder.fs
diff --git a/src/Chunk.fs b/src/Chunk.fs
diff --git a/src/Error.fs b/src/Error.fs
diff --git a/src/Fetch.fs b/src/Fetch.fs