Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions src/All.slnx
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,13 @@
<Project Path="HotChocolate/AspNetCore/src/AspNetCore.Authorization.Opa/HotChocolate.AspNetCore.Authorization.Opa.csproj" />
<Project Path="HotChocolate/AspNetCore/src/AspNetCore.Authorization/HotChocolate.AspNetCore.Authorization.csproj" />
<Project Path="HotChocolate/AspNetCore/src/AspNetCore.CommandLine/HotChocolate.AspNetCore.CommandLine.csproj" />
<Project Path="HotChocolate/AspNetCore/src/AspNetCore.Pipeline/HotChocolate.AspNetCore.Pipeline.csproj" />
<Project Path="HotChocolate/AspNetCore/src/AspNetCore/HotChocolate.AspNetCore.csproj" />
<Project Path="HotChocolate/AspNetCore/src/Transport.Abstractions/HotChocolate.Transport.Abstractions.csproj" />
<Project Path="HotChocolate/AspNetCore/src/Transport.Formatters/HotChocolate.Transport.Formatters.csproj" />
<Project Path="HotChocolate/AspNetCore/src/Transport.Http/HotChocolate.Transport.Http.csproj" />
<Project Path="HotChocolate/AspNetCore/src/Transport.Sockets.Client/HotChocolate.Transport.Sockets.Client.csproj" />
<Project Path="HotChocolate/AspNetCore/src/Transport.Sockets/HotChocolate.Transport.Sockets.csproj" />
<Project Path="HotChocolate/AspNetCore/src/Transport.Formatters/HotChocolate.Transport.Formatters.csproj" />
</Folder>
<Folder Name="/HotChocolate/AspNetCore/test/">
<Project Path="HotChocolate/AspNetCore/test/AspNetCore.Authorization.Opa.Tests/HotChocolate.AspNetCore.Authorization.Opa.Tests.csproj" />
Expand All @@ -67,12 +68,12 @@
</Folder>
<Folder Name="/HotChocolate/Caching/" />
<Folder Name="/HotChocolate/Caching/src/">
<Project Path="HotChocolate/Caching/src/Caching/HotChocolate.Caching.csproj" />
<Project Path="HotChocolate/Caching/src/Caching.Memory/HotChocolate.Caching.Memory.csproj" />
<Project Path="HotChocolate/Caching/src/Caching/HotChocolate.Caching.csproj" />
</Folder>
<Folder Name="/HotChocolate/Caching/test/">
<Project Path="HotChocolate/Caching/test/Caching.Tests/HotChocolate.Caching.Tests.csproj" />
<Project Path="HotChocolate/Caching/test/Caching.Memory.Tests/HotChocolate.Caching.Memory.Tests.csproj" />
<Project Path="HotChocolate/Caching/test/Caching.Tests/HotChocolate.Caching.Tests.csproj" />
</Folder>
<Folder Name="/HotChocolate/Core/" />
<Folder Name="/HotChocolate/Core/src/">
Expand All @@ -95,8 +96,8 @@
<Project Path="HotChocolate/Core/src/Subscriptions/HotChocolate.Subscriptions.csproj" />
<Project Path="HotChocolate/Core/src/Types.Abstractions/HotChocolate.Types.Abstractions.csproj" />
<Project Path="HotChocolate/Core/src/Types.Analyzers/HotChocolate.Types.Analyzers.csproj" />
<Project Path="HotChocolate/Core/src/Types.CursorPagination/HotChocolate.Types.CursorPagination.csproj" />
<Project Path="HotChocolate/Core/src/Types.CursorPagination.Extensions/HotChocolate.Types.CursorPagination.Extensions.csproj" />
<Project Path="HotChocolate/Core/src/Types.CursorPagination/HotChocolate.Types.CursorPagination.csproj" />
<Project Path="HotChocolate/Core/src/Types.Errors/HotChocolate.Types.Errors.csproj" />
<Project Path="HotChocolate/Core/src/Types.Json/HotChocolate.Types.Json.csproj" />
<Project Path="HotChocolate/Core/src/Types.Mutations/HotChocolate.Types.Mutations.csproj" />
Expand Down Expand Up @@ -174,6 +175,7 @@
</Folder>
<Folder Name="/HotChocolate/Fusion-vnext/" />
<Folder Name="/HotChocolate/Fusion-vnext/src/">
<Project Path="HotChocolate/Fusion-vnext/src/Fusion.AspNetCore/HotChocolate.Fusion.AspNetCore.csproj" />
<Project Path="HotChocolate/Fusion-vnext/src/Fusion.CommandLine/HotChocolate.Fusion.CommandLine.csproj" />
<Project Path="HotChocolate/Fusion-vnext/src/Fusion.Composition/HotChocolate.Fusion.Composition.csproj" />
<Project Path="HotChocolate/Fusion-vnext/src/Fusion.Execution.Types/HotChocolate.Fusion.Execution.Types.csproj" />
Expand All @@ -182,6 +184,7 @@
<Project Path="HotChocolate/Fusion-vnext/src/Fusion.Utilities/HotChocolate.Fusion.Utilities.csproj" />
</Folder>
<Folder Name="/HotChocolate/Fusion-vnext/test/">
<Project Path="HotChocolate/Fusion-vnext/test/Fusion.AspNetCore.Tests/HotChocolate.Fusion.AspNetCore.Tests.csproj" />
<Project Path="HotChocolate/Fusion-vnext/test/Fusion.CommandLine.Tests/HotChocolate.Fusion.CommandLine.Tests.csproj" />
<Project Path="HotChocolate/Fusion-vnext/test/Fusion.Composition.Tests/HotChocolate.Fusion.Composition.Tests.csproj" />
<Project Path="HotChocolate/Fusion-vnext/test/Fusion.Execution.Tests/HotChocolate.Fusion.Execution.Tests.csproj" />
Expand Down Expand Up @@ -230,12 +233,12 @@
</Folder>
<Folder Name="/HotChocolate/PersistedOperations/" />
<Folder Name="/HotChocolate/PersistedOperations/src/">
<Project Path="HotChocolate/PersistedOperations/src/PersistedOperations.Abstractions/HotChocolate.PersistedOperations.Abstractions.csproj" />
<Project Path="HotChocolate/PersistedOperations/src/PersistedOperations.AzureBlobStorage/HotChocolate.PersistedOperations.AzureBlobStorage.csproj" />
<Project Path="HotChocolate/PersistedOperations/src/PersistedOperations.FileSystem/HotChocolate.PersistedOperations.FileSystem.csproj" />
<Project Path="HotChocolate/PersistedOperations/src/PersistedOperations.InMemory/HotChocolate.PersistedOperations.InMemory.csproj" />
<Project Path="HotChocolate/PersistedOperations/src/PersistedOperations.Redis/HotChocolate.PersistedOperations.Redis.csproj" />
<Project Path="HotChocolate/PersistedOperations/src/PersistedOperations.Abstractions/HotChocolate.PersistedOperations.Abstractions.csproj" />
<Project Path="HotChocolate/PersistedOperations/src/PersistedOperations.Pipeline/HotChocolate.PersistedOperations.Pipeline.csproj" />
<Project Path="HotChocolate/PersistedOperations/src/PersistedOperations.Redis/HotChocolate.PersistedOperations.Redis.csproj" />
</Folder>
<Folder Name="/HotChocolate/PersistedOperations/test/">
<Project Path="HotChocolate/PersistedOperations/test/PersistedOperations.AzureBlobStorage.Tests/HotChocolate.PersistedOperations.AzureBlobStorage.Tests.csproj" />
Expand Down Expand Up @@ -275,9 +278,9 @@
<Folder Name="/HotChocolate/Utilities/" />
<Folder Name="/HotChocolate/Utilities/src/">
<Project Path="HotChocolate/Utilities/src/Utilities.Buffers/HotChocolate.Utilities.Buffers.csproj" />
<Project Path="HotChocolate/Utilities/src/Utilities.Tasks/HotChocolate.Utilities.Tasks.csproj" />
<Project Path="HotChocolate/Utilities/src/Utilities.DependencyInjection/HotChocolate.Utilities.DependencyInjection.csproj" />
<Project Path="HotChocolate/Utilities/src/Utilities.Introspection/HotChocolate.Utilities.Introspection.csproj" />
<Project Path="HotChocolate/Utilities/src/Utilities.Tasks/HotChocolate.Utilities.Tasks.csproj" />
<Project Path="HotChocolate/Utilities/src/Utilities/HotChocolate.Utilities.csproj" />
</Folder>
<Folder Name="/HotChocolate/Utilities/test/">
Expand Down Expand Up @@ -326,4 +329,4 @@
<Folder Name="/StrawberryShake/Tooling/test/">
<Project Path="StrawberryShake/Tooling/test/Configuration.Tests/StrawberryShake.Tools.Configuration.Tests.csproj" />
</Folder>
</Solution>
</Solution>
Original file line number Diff line number Diff line change
Expand Up @@ -9,44 +9,46 @@ internal sealed class OperationResultSnapshotValueFormatter : SnapshotValueForma
{
protected override void Format(IBufferWriter<byte> snapshot, OperationResult value)
{
var next = false;
var writer = new Utf8JsonWriter(
snapshot,
new JsonWriterOptions
{
Indented = true,
SkipValidation = true,
Encoder = System.Text.Encodings.Web.JavaScriptEncoder.UnsafeRelaxedJsonEscaping
});

writer.WriteStartObject();

if (value.RequestIndex.HasValue)
{
snapshot.Append("RequestIndex: ");
snapshot.Append(value.RequestIndex.Value.ToString());
next = true;
writer.WriteNumber("requestIndex", value.RequestIndex.Value);
}

if (value.VariableIndex.HasValue)
{
snapshot.AppendLine(appendWhenTrue: next);
snapshot.Append("VariableIndex: ");
snapshot.Append(value.VariableIndex.Value.ToString());
next = true;
writer.WriteNumber("variableIndex", value.VariableIndex.Value);
}

if (value.Data.ValueKind is JsonValueKind.Object)
{
snapshot.AppendLine(appendWhenTrue: next);
snapshot.Append("Data: ");
snapshot.Append(value.Data.ToString());
next = true;
writer.WritePropertyName("data");
value.Data.WriteTo(writer);
}

if (value.Errors.ValueKind is JsonValueKind.Array)
{
snapshot.AppendLine(appendWhenTrue: next);
snapshot.Append("Errors: ");
snapshot.Append(value.Errors.ToString());
next = true;
writer.WritePropertyName("errors");
value.Errors.WriteTo(writer);
}

if (value.Extensions.ValueKind is JsonValueKind.Object)
{
snapshot.AppendLine(appendWhenTrue: next);
snapshot.Append("Extensions: ");
snapshot.Append(value.Extensions.ToString());
writer.WritePropertyName("extensions");
value.Extensions.WriteTo(writer);
}

writer.WriteEndObject();
writer.Flush();
}
}
1 change: 1 addition & 0 deletions src/HotChocolate/AspNetCore/HotChocolate.AspNetCore.slnx
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<Project Path="src/AspNetCore.Authorization.Opa/HotChocolate.AspNetCore.Authorization.Opa.csproj" />
<Project Path="src/AspNetCore.Authorization/HotChocolate.AspNetCore.Authorization.csproj" />
<Project Path="src/AspNetCore.CommandLine/HotChocolate.AspNetCore.CommandLine.csproj" />
<Project Path="src/AspNetCore.Pipeline/HotChocolate.AspNetCore.Pipeline.csproj" />
<Project Path="src/AspNetCore/HotChocolate.AspNetCore.csproj" />
<Project Path="src/Transport.Abstractions/HotChocolate.Transport.Abstractions.csproj" />
<Project Path="src/Transport.Http/HotChocolate.Transport.Http.csproj" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
using HotChocolate.Utilities;
using Microsoft.Extensions.Primitives;

namespace HotChocolate.AspNetCore;
Expand Down Expand Up @@ -48,45 +47,47 @@ internal AcceptMediaType(
Charset = charset.HasValue ? charset.Value : null;
IsUtf8 = Charset?.Equals("utf-8", StringComparison.OrdinalIgnoreCase) ?? true;

if (Type.EqualsOrdinal(ContentType.Types.All) && SubType.EqualsOrdinal(ContentType.Types.All))
if (Type.Equals(ContentType.Types.All, StringComparison.Ordinal)
&& SubType.Equals(ContentType.Types.All, StringComparison.Ordinal))
{
Kind = AcceptMediaTypeKind.All;
}
else if (Type.EqualsOrdinal(ContentType.Types.Application))
else if (Type.Equals(ContentType.Types.Application, StringComparison.Ordinal))
{
if (SubType.EqualsOrdinal(ContentType.Types.All))
if (SubType.Equals(ContentType.Types.All, StringComparison.Ordinal))
{
Kind = AcceptMediaTypeKind.AllApplication;
}
else if (SubType.EqualsOrdinal(ContentType.SubTypes.GraphQLResponse))
else if (SubType.Equals(ContentType.SubTypes.GraphQLResponse, StringComparison.Ordinal))
{
Kind = AcceptMediaTypeKind.ApplicationGraphQL;
}
else if (SubType.EqualsOrdinal(ContentType.SubTypes.GraphQLResponseStream))
else if (SubType.Equals(ContentType.SubTypes.GraphQLResponseStream, StringComparison.Ordinal))
{
Kind = AcceptMediaTypeKind.ApplicationGraphQLStream;
}
else if (SubType.EqualsOrdinal(ContentType.SubTypes.Json))
else if (SubType.Equals(ContentType.SubTypes.Json, StringComparison.Ordinal))
{
Kind = AcceptMediaTypeKind.ApplicationJson;
}
else if (SubType.EqualsOrdinal(ContentType.SubTypes.JsonLines))
else if (SubType.Equals(ContentType.SubTypes.JsonLines, StringComparison.Ordinal))
{
Kind = AcceptMediaTypeKind.ApplicationJsonLines;
}
}
else if (Type.EqualsOrdinal(ContentType.Types.MultiPart))
else if (Type.Equals(ContentType.Types.MultiPart, StringComparison.Ordinal))
{
if (SubType.EqualsOrdinal(ContentType.Types.All))
if (SubType.Equals(ContentType.Types.All, StringComparison.Ordinal))
{
Kind = AcceptMediaTypeKind.AllMultiPart;
}
else if (SubType.EqualsOrdinal(ContentType.SubTypes.Mixed))
else if (SubType.Equals(ContentType.SubTypes.Mixed, StringComparison.Ordinal))
{
Kind = AcceptMediaTypeKind.MultiPartMixed;
}
}
else if (Type.EqualsOrdinal(ContentType.Types.Text) && SubType.EqualsOrdinal(ContentType.SubTypes.EventStream))
else if (Type.Equals(ContentType.Types.Text, StringComparison.Ordinal)
&& SubType.Equals(ContentType.SubTypes.EventStream, StringComparison.Ordinal))
{
Kind = AcceptMediaTypeKind.EventStream;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ namespace HotChocolate.AspNetCore;
[Flags]
public enum AllowedGetOperations
{
None = 0,
Query = 1,
Mutation = 2,
Subscription = 4,
Expand Down
Loading