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
13 changes: 9 additions & 4 deletions src/JsonPatchGenerator/DefaultJsonPatchGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,23 @@
using Firebend.JsonPatch.Models;
using Microsoft.AspNetCore.JsonPatch;
using Microsoft.AspNetCore.JsonPatch.Operations;
using Microsoft.Extensions.DependencyInjection;
using Newtonsoft.Json;

namespace Firebend.JsonPatch;

public class DefaultJsonPatchGenerator : IJsonPatchGenerator
{
private readonly IJsonDiffDetector _diffDetector;
private readonly Func<IJsonPatchWriter> _writerFactory;
private readonly IServiceProvider _serviceProvider;
private readonly IJsonDiffSettingsProvider _settings;
public DefaultJsonPatchGenerator(IJsonDiffDetector diffDetector, Func<IJsonPatchWriter> writerFactory, IJsonDiffSettingsProvider settings)

public DefaultJsonPatchGenerator(IJsonDiffDetector diffDetector,
IServiceProvider serviceProvider,
IJsonDiffSettingsProvider settings)
{
_diffDetector = diffDetector;
_writerFactory = writerFactory;
_serviceProvider = serviceProvider;
_settings = settings;
}

Expand All @@ -42,7 +46,8 @@ public JsonPatchDocument<T> Generate<T>(T original, T modified)

if (!diffs.Any()) { return new(); }

var writer = _writerFactory();
using var scope = _serviceProvider.CreateScope();
var writer = scope.ServiceProvider.GetRequiredService<IJsonPatchWriter>();

foreach (var jsonDiff in diffs)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,7 @@ public static IServiceCollection AddJsonPatchGenerator(this IServiceCollection c

collection.TryAddSingleton<IJsonDiffSettingsProvider>(new JsonDiffSettingsProvider(settings));
collection.TryAddTransient<IJsonPatchWriter, JsonPatchWriter>();
collection.TryAddTransient<IJsonPatchGenerator>(sp =>
new DefaultJsonPatchGenerator(sp.GetRequiredService<IJsonDiffDetector>(),
sp.GetRequiredService<IJsonPatchWriter>,
sp.GetRequiredService<IJsonDiffSettingsProvider>()));
collection.TryAddTransient<IJsonPatchGenerator, DefaultJsonPatchGenerator>();
collection.TryAddTransient<IJsonDiffDetector, JsonDiffDetector>();

return collection;
Expand Down