Skip to content

Commit 6e0d287

Browse files
author
Bart Koelman
committed
Adapter renames:
- IOperationsDocumentAdapter -> IDocumentInOperationsRequestAdapter - IResourceDocumentAdapter -> IDocumentInResourceOrRelationshipRequestAdapter - IOperationResourceDataAdapter -> IResourceDataInOperationsRequestAdapter
1 parent 0923c8b commit 6e0d287

11 files changed

+36
-34
lines changed

‎benchmarks/Deserialization/DeserializationBenchmarkBase.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ protected DeserializationBenchmarkBase()
4242
var resourceDataAdapter = new ResourceDataAdapter(resourceDefinitionAccessor, resourceObjectAdapter);
4343

4444
var atomicReferenceAdapter = new AtomicReferenceAdapter(resourceGraph, resourceFactory);
45-
var atomicOperationResourceDataAdapter = new OperationResourceDataAdapter(resourceDefinitionAccessor, resourceObjectAdapter);
45+
var atomicOperationResourceDataAdapter = new ResourceDataInOperationsRequestAdapter(resourceDefinitionAccessor, resourceObjectAdapter);
4646

4747
var atomicOperationObjectAdapter = new AtomicOperationObjectAdapter(resourceGraph, options, atomicReferenceAdapter,
4848
atomicOperationResourceDataAdapter, relationshipDataAdapter);
4949

50-
var resourceDocumentAdapter = new ResourceDocumentAdapter(options, resourceDataAdapter, relationshipDataAdapter);
51-
var operationsDocumentAdapter = new OperationsDocumentAdapter(options, atomicOperationObjectAdapter);
50+
var resourceDocumentAdapter = new DocumentInResourceOrRelationshipRequestAdapter(options, resourceDataAdapter, relationshipDataAdapter);
51+
var operationsDocumentAdapter = new DocumentInOperationsRequestAdapter(options, atomicOperationObjectAdapter);
5252

5353
DocumentAdapter = new DocumentAdapter(request, targetedFields, resourceDocumentAdapter, operationsDocumentAdapter);
5454
}

‎src/JsonApiDotNetCore/Configuration/JsonApiApplicationBuilder.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -268,10 +268,10 @@ private void AddSerializationLayer()
268268
_services.AddScoped<IResourceObjectAdapter, ResourceObjectAdapter>();
269269
_services.AddScoped<IResourceDataAdapter, ResourceDataAdapter>();
270270
_services.AddScoped<IAtomicReferenceAdapter, AtomicReferenceAdapter>();
271-
_services.AddScoped<IOperationResourceDataAdapter, OperationResourceDataAdapter>();
271+
_services.AddScoped<IResourceDataInOperationsRequestAdapter, ResourceDataInOperationsRequestAdapter>();
272272
_services.AddScoped<IAtomicOperationObjectAdapter, AtomicOperationObjectAdapter>();
273-
_services.AddScoped<IResourceDocumentAdapter, ResourceDocumentAdapter>();
274-
_services.AddScoped<IOperationsDocumentAdapter, OperationsDocumentAdapter>();
273+
_services.AddScoped<IDocumentInResourceOrRelationshipRequestAdapter, DocumentInResourceOrRelationshipRequestAdapter>();
274+
_services.AddScoped<IDocumentInOperationsRequestAdapter, DocumentInOperationsRequestAdapter>();
275275
_services.AddScoped<IDocumentAdapter, DocumentAdapter>();
276276
}
277277

‎src/JsonApiDotNetCore/Serialization/RequestAdapters/AtomicOperationObjectAdapter.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,25 @@ namespace JsonApiDotNetCore.Serialization.RequestAdapters
1010
/// <inheritdoc />
1111
public sealed class AtomicOperationObjectAdapter : IAtomicOperationObjectAdapter
1212
{
13-
private readonly IOperationResourceDataAdapter _operationResourceDataAdapter;
13+
private readonly IResourceDataInOperationsRequestAdapter _resourceDataInOperationsRequestAdapter;
1414
private readonly IAtomicReferenceAdapter _atomicReferenceAdapter;
1515
private readonly IRelationshipDataAdapter _relationshipDataAdapter;
1616
private readonly IResourceGraph _resourceGraph;
1717
private readonly IJsonApiOptions _options;
1818

1919
public AtomicOperationObjectAdapter(IResourceGraph resourceGraph, IJsonApiOptions options, IAtomicReferenceAdapter atomicReferenceAdapter,
20-
IOperationResourceDataAdapter operationResourceDataAdapter, IRelationshipDataAdapter relationshipDataAdapter)
20+
IResourceDataInOperationsRequestAdapter resourceDataInOperationsRequestAdapter, IRelationshipDataAdapter relationshipDataAdapter)
2121
{
2222
ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
2323
ArgumentGuard.NotNull(options, nameof(options));
2424
ArgumentGuard.NotNull(atomicReferenceAdapter, nameof(atomicReferenceAdapter));
25-
ArgumentGuard.NotNull(operationResourceDataAdapter, nameof(operationResourceDataAdapter));
25+
ArgumentGuard.NotNull(resourceDataInOperationsRequestAdapter, nameof(resourceDataInOperationsRequestAdapter));
2626
ArgumentGuard.NotNull(relationshipDataAdapter, nameof(relationshipDataAdapter));
2727

2828
_resourceGraph = resourceGraph;
2929
_options = options;
3030
_atomicReferenceAdapter = atomicReferenceAdapter;
31-
_operationResourceDataAdapter = operationResourceDataAdapter;
31+
_resourceDataInOperationsRequestAdapter = resourceDataInOperationsRequestAdapter;
3232
_relationshipDataAdapter = relationshipDataAdapter;
3333
}
3434

@@ -51,7 +51,7 @@ public OperationContainer Convert(AtomicOperationObject atomicOperationObject, R
5151

5252
if (writeOperation == WriteOperationKind.CreateResource || writeOperation == WriteOperationKind.UpdateResource)
5353
{
54-
primaryResource = _operationResourceDataAdapter.Convert(atomicOperationObject.Data, requirements, state);
54+
primaryResource = _resourceDataInOperationsRequestAdapter.Convert(atomicOperationObject.Data, requirements, state);
5555
}
5656

5757
return new OperationContainer(writeOperation, primaryResource, state.WritableTargetedFields, state.Request);

‎src/JsonApiDotNetCore/Serialization/RequestAdapters/DocumentAdapter.cs

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,22 @@ public sealed class DocumentAdapter : IDocumentAdapter
99
{
1010
private readonly IJsonApiRequest _request;
1111
private readonly ITargetedFields _targetedFields;
12-
private readonly IResourceDocumentAdapter _resourceDocumentAdapter;
13-
private readonly IOperationsDocumentAdapter _operationsDocumentAdapter;
12+
private readonly IDocumentInResourceOrRelationshipRequestAdapter _documentInResourceOrRelationshipRequestAdapter;
13+
private readonly IDocumentInOperationsRequestAdapter _documentInOperationsRequestAdapter;
1414

15-
public DocumentAdapter(IJsonApiRequest request, ITargetedFields targetedFields, IResourceDocumentAdapter resourceDocumentAdapter,
16-
IOperationsDocumentAdapter operationsDocumentAdapter)
15+
public DocumentAdapter(IJsonApiRequest request, ITargetedFields targetedFields,
16+
IDocumentInResourceOrRelationshipRequestAdapter documentInResourceOrRelationshipRequestAdapter,
17+
IDocumentInOperationsRequestAdapter documentInOperationsRequestAdapter)
1718
{
1819
ArgumentGuard.NotNull(request, nameof(request));
1920
ArgumentGuard.NotNull(targetedFields, nameof(targetedFields));
20-
ArgumentGuard.NotNull(resourceDocumentAdapter, nameof(resourceDocumentAdapter));
21-
ArgumentGuard.NotNull(operationsDocumentAdapter, nameof(operationsDocumentAdapter));
21+
ArgumentGuard.NotNull(documentInResourceOrRelationshipRequestAdapter, nameof(documentInResourceOrRelationshipRequestAdapter));
22+
ArgumentGuard.NotNull(documentInOperationsRequestAdapter, nameof(documentInOperationsRequestAdapter));
2223

2324
_request = request;
2425
_targetedFields = targetedFields;
25-
_resourceDocumentAdapter = resourceDocumentAdapter;
26-
_operationsDocumentAdapter = operationsDocumentAdapter;
26+
_documentInResourceOrRelationshipRequestAdapter = documentInResourceOrRelationshipRequestAdapter;
27+
_documentInOperationsRequestAdapter = documentInOperationsRequestAdapter;
2728
}
2829

2930
/// <inheritdoc />
@@ -34,8 +35,8 @@ public object Convert(Document document)
3435
using var context = new RequestAdapterState(_request, _targetedFields);
3536

3637
return context.Request.Kind == EndpointKind.AtomicOperations
37-
? _operationsDocumentAdapter.Convert(document, context)
38-
: _resourceDocumentAdapter.Convert(document, context);
38+
? _documentInOperationsRequestAdapter.Convert(document, context)
39+
: _documentInResourceOrRelationshipRequestAdapter.Convert(document, context);
3940
}
4041
}
4142
}

‎src/JsonApiDotNetCore/Serialization/RequestAdapters/OperationsDocumentAdapter.cs renamed to ‎src/JsonApiDotNetCore/Serialization/RequestAdapters/DocumentInOperationsRequestAdapter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
namespace JsonApiDotNetCore.Serialization.RequestAdapters
88
{
99
/// <inheritdoc />
10-
public sealed class OperationsDocumentAdapter : IOperationsDocumentAdapter
10+
public sealed class DocumentInOperationsRequestAdapter : IDocumentInOperationsRequestAdapter
1111
{
1212
private readonly IJsonApiOptions _options;
1313
private readonly IAtomicOperationObjectAdapter _atomicOperationObjectAdapter;
1414

15-
public OperationsDocumentAdapter(IJsonApiOptions options, IAtomicOperationObjectAdapter atomicOperationObjectAdapter)
15+
public DocumentInOperationsRequestAdapter(IJsonApiOptions options, IAtomicOperationObjectAdapter atomicOperationObjectAdapter)
1616
{
1717
ArgumentGuard.NotNull(options, nameof(options));
1818
ArgumentGuard.NotNull(atomicOperationObjectAdapter, nameof(atomicOperationObjectAdapter));

‎src/JsonApiDotNetCore/Serialization/RequestAdapters/ResourceDocumentAdapter.cs renamed to ‎src/JsonApiDotNetCore/Serialization/RequestAdapters/DocumentInResourceOrRelationshipRequestAdapter.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@
77
namespace JsonApiDotNetCore.Serialization.RequestAdapters
88
{
99
/// <inheritdoc />
10-
public sealed class ResourceDocumentAdapter : IResourceDocumentAdapter
10+
public sealed class DocumentInResourceOrRelationshipRequestAdapter : IDocumentInResourceOrRelationshipRequestAdapter
1111
{
1212
private readonly IJsonApiOptions _options;
1313
private readonly IResourceDataAdapter _resourceDataAdapter;
1414
private readonly IRelationshipDataAdapter _relationshipDataAdapter;
1515

16-
public ResourceDocumentAdapter(IJsonApiOptions options, IResourceDataAdapter resourceDataAdapter, IRelationshipDataAdapter relationshipDataAdapter)
16+
public DocumentInResourceOrRelationshipRequestAdapter(IJsonApiOptions options, IResourceDataAdapter resourceDataAdapter,
17+
IRelationshipDataAdapter relationshipDataAdapter)
1718
{
1819
ArgumentGuard.NotNull(options, nameof(options));
1920
ArgumentGuard.NotNull(resourceDataAdapter, nameof(resourceDataAdapter));

‎src/JsonApiDotNetCore/Serialization/RequestAdapters/IOperationsDocumentAdapter.cs renamed to ‎src/JsonApiDotNetCore/Serialization/RequestAdapters/IDocumentInOperationsRequestAdapter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace JsonApiDotNetCore.Serialization.RequestAdapters
77
/// <summary>
88
/// Validates and converts a <see cref="Document" /> belonging to an atomic:operations request.
99
/// </summary>
10-
public interface IOperationsDocumentAdapter
10+
public interface IDocumentInOperationsRequestAdapter
1111
{
1212
/// <summary>
1313
/// Validates and converts the specified <paramref name="document" />.

‎src/JsonApiDotNetCore/Serialization/RequestAdapters/IResourceDocumentAdapter.cs renamed to ‎src/JsonApiDotNetCore/Serialization/RequestAdapters/IDocumentInResourceOrRelationshipRequestAdapter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ namespace JsonApiDotNetCore.Serialization.RequestAdapters
55
/// <summary>
66
/// Validates and converts a <see cref="Document" /> belonging to a resource or relationship request.
77
/// </summary>
8-
public interface IResourceDocumentAdapter
8+
public interface IDocumentInResourceOrRelationshipRequestAdapter
99
{
1010
/// <summary>
1111
/// Validates and converts the specified <paramref name="document" />.

‎src/JsonApiDotNetCore/Serialization/RequestAdapters/IOperationResourceDataAdapter.cs renamed to ‎src/JsonApiDotNetCore/Serialization/RequestAdapters/IResourceDataInOperationsRequestAdapter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace JsonApiDotNetCore.Serialization.RequestAdapters
66
/// <summary>
77
/// Validates and converts the data from an entry in an atomic:operations request that creates or updates a resource.
88
/// </summary>
9-
public interface IOperationResourceDataAdapter
9+
public interface IResourceDataInOperationsRequestAdapter
1010
{
1111
/// <summary>
1212
/// Validates and converts the specified <paramref name="data" />.

‎src/JsonApiDotNetCore/Serialization/RequestAdapters/OperationResourceDataAdapter.cs renamed to ‎src/JsonApiDotNetCore/Serialization/RequestAdapters/ResourceDataInOperationsRequestAdapter.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44

55
namespace JsonApiDotNetCore.Serialization.RequestAdapters
66
{
7-
/// <inheritdoc cref="IOperationResourceDataAdapter" />
8-
public sealed class OperationResourceDataAdapter : ResourceDataAdapter, IOperationResourceDataAdapter
7+
/// <inheritdoc cref="IResourceDataInOperationsRequestAdapter" />
8+
public sealed class ResourceDataInOperationsRequestAdapter : ResourceDataAdapter, IResourceDataInOperationsRequestAdapter
99
{
10-
public OperationResourceDataAdapter(IResourceDefinitionAccessor resourceDefinitionAccessor, IResourceObjectAdapter resourceObjectAdapter)
10+
public ResourceDataInOperationsRequestAdapter(IResourceDefinitionAccessor resourceDefinitionAccessor, IResourceObjectAdapter resourceObjectAdapter)
1111
: base(resourceDefinitionAccessor, resourceObjectAdapter)
1212
{
1313
}

‎test/JsonApiDotNetCoreTests/UnitTests/Serialization/InputConversionTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,13 +259,13 @@ private static DocumentAdapter CreateDocumentAdapter<TResource>(Func<IResourceGr
259259
var resourceDataAdapter = new ResourceDataAdapter(resourceDefinitionAccessor, resourceObjectAdapter);
260260

261261
var atomicReferenceAdapter = new AtomicReferenceAdapter(resourceGraph, resourceFactory);
262-
var atomicOperationResourceDataAdapter = new OperationResourceDataAdapter(resourceDefinitionAccessor, resourceObjectAdapter);
262+
var atomicOperationResourceDataAdapter = new ResourceDataInOperationsRequestAdapter(resourceDefinitionAccessor, resourceObjectAdapter);
263263

264264
var atomicOperationObjectAdapter = new AtomicOperationObjectAdapter(resourceGraph, options, atomicReferenceAdapter,
265265
atomicOperationResourceDataAdapter, relationshipDataAdapter);
266266

267-
var resourceDocumentAdapter = new ResourceDocumentAdapter(options, resourceDataAdapter, relationshipDataAdapter);
268-
var operationsDocumentAdapter = new OperationsDocumentAdapter(options, atomicOperationObjectAdapter);
267+
var resourceDocumentAdapter = new DocumentInResourceOrRelationshipRequestAdapter(options, resourceDataAdapter, relationshipDataAdapter);
268+
var operationsDocumentAdapter = new DocumentInOperationsRequestAdapter(options, atomicOperationObjectAdapter);
269269

270270
return new DocumentAdapter(request, targetedFields, resourceDocumentAdapter, operationsDocumentAdapter);
271271
}

0 commit comments

Comments
 (0)