diff --git a/src/FSharp.Data.GraphQL.Server.AspNetCore/GraphQLSubscriptionsManagement.fs b/src/FSharp.Data.GraphQL.Server.AspNetCore/GraphQLSubscriptionsManagement.fs index 3f3a2684..7cd4ba43 100644 --- a/src/FSharp.Data.GraphQL.Server.AspNetCore/GraphQLSubscriptionsManagement.fs +++ b/src/FSharp.Data.GraphQL.Server.AspNetCore/GraphQLSubscriptionsManagement.fs @@ -1,6 +1,6 @@ module internal FSharp.Data.GraphQL.Server.AspNetCore.GraphQLSubscriptionsManagement -open FSharp.Data.GraphQL.Shared.Websockets +open FSharp.Data.GraphQL.Shared.WebSockets let addSubscription (id : SubscriptionId, unsubscriber : SubscriptionUnsubscriber, onUnsubscribe : OnUnsubscribeAction) diff --git a/src/FSharp.Data.GraphQL.Server.AspNetCore/GraphQLWebsocketMiddleware.fs b/src/FSharp.Data.GraphQL.Server.AspNetCore/GraphQLWebsocketMiddleware.fs index 183277a8..d06d0d55 100644 --- a/src/FSharp.Data.GraphQL.Server.AspNetCore/GraphQLWebsocketMiddleware.fs +++ b/src/FSharp.Data.GraphQL.Server.AspNetCore/GraphQLWebsocketMiddleware.fs @@ -20,7 +20,7 @@ open FsToolkit.ErrorHandling open FSharp.Data.GraphQL open FSharp.Data.GraphQL.Execution -open FSharp.Data.GraphQL.Shared.Websockets +open FSharp.Data.GraphQL.Shared.WebSockets type GraphQLWebSocketMiddleware<'Root> ( diff --git a/src/FSharp.Data.GraphQL.Shared/FSharp.Data.GraphQL.Shared.fsproj b/src/FSharp.Data.GraphQL.Shared/FSharp.Data.GraphQL.Shared.fsproj index cade200d..dc655f06 100644 --- a/src/FSharp.Data.GraphQL.Shared/FSharp.Data.GraphQL.Shared.fsproj +++ b/src/FSharp.Data.GraphQL.Shared/FSharp.Data.GraphQL.Shared.fsproj @@ -48,7 +48,6 @@ - @@ -62,7 +61,7 @@ - + diff --git a/src/FSharp.Data.GraphQL.Shared/Serialization/JsonConverters.fs b/src/FSharp.Data.GraphQL.Shared/Serialization/JsonConverters.fs index 49c1038e..a0261936 100644 --- a/src/FSharp.Data.GraphQL.Shared/Serialization/JsonConverters.fs +++ b/src/FSharp.Data.GraphQL.Shared/Serialization/JsonConverters.fs @@ -6,7 +6,7 @@ open System.Text.Json.Serialization open FSharp.Data.GraphQL open FSharp.Data.GraphQL.Shared -open FSharp.Data.GraphQL.Shared.Websockets +open FSharp.Data.GraphQL.Shared.WebSockets [] type ClientMessageConverter () = diff --git a/src/FSharp.Data.GraphQL.Shared/Websockets/Messages.fs b/src/FSharp.Data.GraphQL.Shared/WebSockets.fs similarity index 90% rename from src/FSharp.Data.GraphQL.Shared/Websockets/Messages.fs rename to src/FSharp.Data.GraphQL.Shared/WebSockets.fs index 411033f1..20b1c540 100644 --- a/src/FSharp.Data.GraphQL.Shared/Websockets/Messages.fs +++ b/src/FSharp.Data.GraphQL.Shared/WebSockets.fs @@ -1,10 +1,13 @@ -namespace FSharp.Data.GraphQL.Shared.Websockets +namespace FSharp.Data.GraphQL.Shared.WebSockets open System open System.Collections.Generic open System.Text.Json open FSharp.Data.GraphQL.Shared +type InvalidWebsocketMessageException (explanation : string) = + inherit System.Exception (explanation) + type SubscriptionId = string type SubscriptionUnsubscriber = IDisposable type OnUnsubscribeAction = SubscriptionId -> unit diff --git a/src/FSharp.Data.GraphQL.Shared/Websockets/Exceptions.fs b/src/FSharp.Data.GraphQL.Shared/Websockets/Exceptions.fs deleted file mode 100644 index d5003c2b..00000000 --- a/src/FSharp.Data.GraphQL.Shared/Websockets/Exceptions.fs +++ /dev/null @@ -1,4 +0,0 @@ -namespace FSharp.Data.GraphQL.Shared.Websockets - -type InvalidWebsocketMessageException (explanation : string) = - inherit System.Exception (explanation) \ No newline at end of file diff --git a/tests/FSharp.Data.GraphQL.Tests/AspNetCore/InvalidMessageTests.fs b/tests/FSharp.Data.GraphQL.Tests/AspNetCore/InvalidMessageTests.fs index 82e40664..f536da6c 100644 --- a/tests/FSharp.Data.GraphQL.Tests/AspNetCore/InvalidMessageTests.fs +++ b/tests/FSharp.Data.GraphQL.Tests/AspNetCore/InvalidMessageTests.fs @@ -2,7 +2,7 @@ module FSharp.Data.GraphQL.Tests.AspNetCore.InvalidMessageTests open System.Text.Json open Xunit -open FSharp.Data.GraphQL.Shared.Websockets +open FSharp.Data.GraphQL.Shared.WebSockets let toClientMessage (theInput : string) = JsonSerializer.Deserialize (theInput, serializerOptions) diff --git a/tests/FSharp.Data.GraphQL.Tests/AspNetCore/SerializationTests.fs b/tests/FSharp.Data.GraphQL.Tests/AspNetCore/SerializationTests.fs index e4dcd0f0..3ba85567 100644 --- a/tests/FSharp.Data.GraphQL.Tests/AspNetCore/SerializationTests.fs +++ b/tests/FSharp.Data.GraphQL.Tests/AspNetCore/SerializationTests.fs @@ -4,7 +4,7 @@ open Xunit open System.Text.Json open FSharp.Data.GraphQL.Ast open FSharp.Data.GraphQL.Shared -open FSharp.Data.GraphQL.Shared.Websockets +open FSharp.Data.GraphQL.Shared.WebSockets open System.Text.Json.Serialization []