Skip to content

Revert "Use MVC JsonSerializerSettings & Indent JSON in Development" #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pekkah merged 3 commits into from
Jun 6, 2018
Merged

Revert "Use MVC JsonSerializerSettings & Indent JSON in Development" #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60cf3ab
Revert "Revert "Add ComplexityConfiguration, EnableMetrics, SetFieldM…
pekkah Jun 6, 2018
8d4db0f
Revert "Add ComplexityConfiguration, EnableMetrics, SetFieldMiddlewar…
pekkah Jun 6, 2018
a270570
Revert "Initialize the DocumentWriter so it indents in development an…
pekkah Jun 6, 2018
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
3 changes: 1 addition & 2 deletions src/AspNetCore/AspNetCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
Expand All @@ -17,7 +17,6 @@

<ItemGroup>
<PackageReference Include="GraphQL" Version="2.0.0-alpha-864" />
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0" />
Expand Down
21 changes: 6 additions & 15 deletions src/AspNetCore/GraphQLExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
using GraphQL.Http;
using GraphQL.Subscription;
using GraphQL.Types;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection.Extensions;
using Microsoft.Extensions.Options;
using Newtonsoft.Json;

namespace GraphQL.Server.Transports.AspNetCore
{
Expand All @@ -14,19 +13,11 @@ public static class GraphQLExtensions
/// <summary>
/// Adds the GraphQLHttp to services
/// </summary>
/// <param name="services">The service collection to register the services on</param>
/// <returns>The <see cref="IServiceCollection"/> received as parameter</returns>
/// <param name="services">The servicecollection to registrer the services on</param>
/// <returns>The <see cref="IServiceCollection"/> recieved as parameter</returns>
public static IServiceCollection AddGraphQLHttp(this IServiceCollection services)
{
services.TryAddSingleton<IDocumentWriter>(
x =>
{
var hostingEnvironment = x.GetRequiredService<IHostingEnvironment>();
var jsonSerializerSettings = x.GetRequiredService<IOptions<JsonSerializerSettings>>();
return new DocumentWriter(
hostingEnvironment.IsDevelopment() ? Formatting.Indented : Formatting.None,
jsonSerializerSettings.Value);
});
services.TryAddSingleton<IDocumentWriter, DocumentWriter>();
services.TryAddSingleton<IDocumentExecuter, DocumentExecuter>();

return services;
Expand All @@ -36,8 +27,8 @@ public static IServiceCollection AddGraphQLHttp(this IServiceCollection services
/// Adds the GraphQLHttp to services
/// </summary>
/// <typeparam name="TUserContextBuilder">The <see cref="IUserContextBuilder"/> to use for generating the userContext used for the GraphQL request</typeparam>
/// <param name="services">The service collection to register the services on</param>
/// <returns>The <see cref="IServiceCollection"/> received as parameter</returns>
/// <param name="services">The servicecollection to registrer the services on</param>
/// <returns>The <see cref="IServiceCollection"/> recieved as parameter</returns>
public static IServiceCollection AddGraphQLHttp<TUserContextBuilder>(this IServiceCollection services)
where TUserContextBuilder : class, IUserContextBuilder
{
Expand Down