Skip to content

Commit 5f60afa

Browse files
committed
Consistent parameter naming and removed a leftover dynamic object test
1 parent 428141d commit 5f60afa

File tree

7 files changed

+72
-375
lines changed

7 files changed

+72
-375
lines changed

src/Features/JsonPatch.SystemTextJson/src/Adapters/ObjectAdapter.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,27 @@ public class ObjectAdapter : IObjectAdapterWithTest
1616
/// <summary>
1717
/// Initializes a new instance of <see cref="ObjectAdapter"/>.
1818
/// </summary>
19-
/// <param name="jsonSerializerOptions">The <see cref="JsonSerializerOptions"/>.</param>
19+
/// <param name="serializerOptions">The <see cref="JsonSerializerOptions"/>.</param>
2020
/// <param name="logErrorAction">The <see cref="Action"/> for logging <see cref="JsonPatchError"/>.</param>
2121
public ObjectAdapter(
22-
JsonSerializerOptions jsonSerializerOptions,
22+
JsonSerializerOptions serializerOptions,
2323
Action<JsonPatchError> logErrorAction) :
24-
this(jsonSerializerOptions, logErrorAction, Adapters.AdapterFactory.Default)
24+
this(serializerOptions, logErrorAction, Adapters.AdapterFactory.Default)
2525
{
2626
}
2727

2828
/// <summary>
2929
/// Initializes a new instance of <see cref="ObjectAdapter"/>.
3030
/// </summary>
31-
/// <param name="jsonSerializerOptions">The <see cref="JsonSerializerOptions"/>.</param>
31+
/// <param name="serializerOptions">The <see cref="JsonSerializerOptions"/>.</param>
3232
/// <param name="logErrorAction">The <see cref="Action"/> for logging <see cref="JsonPatchError"/>.</param>
3333
/// <param name="adapterFactory">The <see cref="IAdapterFactory"/> to use when creating adaptors.</param>
3434
public ObjectAdapter(
35-
JsonSerializerOptions jsonSerializerOptions,
35+
JsonSerializerOptions serializerOptions,
3636
Action<JsonPatchError> logErrorAction,
3737
IAdapterFactory adapterFactory)
3838
{
39-
SerializerOptions = jsonSerializerOptions ?? throw new ArgumentNullException(nameof(jsonSerializerOptions));
39+
SerializerOptions = serializerOptions ?? throw new ArgumentNullException(nameof(serializerOptions));
4040
LogErrorAction = logErrorAction;
4141
AdapterFactory = adapterFactory ?? throw new ArgumentNullException(nameof(adapterFactory));
4242
}

src/Features/JsonPatch.SystemTextJson/src/Internal/ConversionResultProvider.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public static ConversionResult ConvertTo(object value, Type typeToConvertTo)
1818
return ConvertTo(value, typeToConvertTo, null);
1919
}
2020

21-
internal static ConversionResult ConvertTo(object value, Type typeToConvertTo, JsonSerializerOptions jsonSerializerOptions)
21+
internal static ConversionResult ConvertTo(object value, Type typeToConvertTo, JsonSerializerOptions serializerOptions)
2222
{
2323
if (value == null)
2424
{
@@ -39,8 +39,8 @@ internal static ConversionResult ConvertTo(object value, Type typeToConvertTo, J
3939

4040
try
4141
{
42-
var serializedDocument = JsonSerializer.Serialize(value, jsonSerializerOptions);
43-
var deserialized = JsonSerializer.Deserialize(serializedDocument, typeToConvertTo, jsonSerializerOptions);
42+
var serializedDocument = JsonSerializer.Serialize(value, serializerOptions);
43+
var deserialized = JsonSerializer.Deserialize(serializedDocument, typeToConvertTo, serializerOptions);
4444
return new ConversionResult(true, deserialized);
4545
}
4646
catch

src/Features/JsonPatch.SystemTextJson/src/Internal/IAdapter.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,41 +14,41 @@ public interface IAdapter
1414
bool TryTraverse(
1515
object target,
1616
string segment,
17-
JsonSerializerOptions jsonSerializerOptions,
17+
JsonSerializerOptions serializerOptions,
1818
out object nextTarget,
1919
out string errorMessage);
2020

2121
bool TryAdd(
2222
object target,
2323
string segment,
24-
JsonSerializerOptions jsonSerializerOptions,
24+
JsonSerializerOptions serializerOptions,
2525
object value,
2626
out string errorMessage);
2727

2828
bool TryRemove(
2929
object target,
3030
string segment,
31-
JsonSerializerOptions jsonSerializerOptions,
31+
JsonSerializerOptions serializerOptions,
3232
out string errorMessage);
3333

3434
bool TryGet(
3535
object target,
3636
string segment,
37-
JsonSerializerOptions jsonSerializerOptions,
37+
JsonSerializerOptions serializerOptions,
3838
out object value,
3939
out string errorMessage);
4040

4141
bool TryReplace(
4242
object target,
4343
string segment,
44-
JsonSerializerOptions jsonSerializerOptions,
44+
JsonSerializerOptions serializerOptions,
4545
object value,
4646
out string errorMessage);
4747

4848
bool TryTest(
4949
object target,
5050
string segment,
51-
JsonSerializerOptions jsonSerializerOptions,
51+
JsonSerializerOptions serializerOptions,
5252
object value,
5353
out string errorMessage);
5454
}

0 commit comments

Comments
 (0)