Skip to content

Commit 4db6c26

Browse files
committed
Refactoring based as per code review suggestions
1 parent 8408803 commit 4db6c26

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

src/JsonApiDotNetCore/Builders/DocumentBuilder.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ public class DocumentBuilder : IDocumentBuilder
1313
private readonly IJsonApiContext _jsonApiContext;
1414
private readonly IContextGraph _contextGraph;
1515
private readonly IRequestMeta _requestMeta;
16-
private readonly DocumentBuilderOptions _documentBuilderOptions = new DocumentBuilderOptions();
16+
private readonly DocumentBuilderOptions _documentBuilderOptions;
1717

18-
public DocumentBuilder(IJsonApiContext jsonApiContext, IRequestMeta requestMeta=null, IDocumentBuilderBehavior documentBuilderBehavior=null)
18+
public DocumentBuilder(IJsonApiContext jsonApiContext, IRequestMeta requestMeta=null, IDocumentBuilderOptionsProvider documentBuilderOptionsProvider=null)
1919
{
2020
_jsonApiContext = jsonApiContext;
2121
_contextGraph = jsonApiContext.ContextGraph;
2222
_requestMeta = requestMeta;
23-
_documentBuilderOptions = documentBuilderBehavior?.GetDocumentBuilderOptions() ?? _documentBuilderOptions;
23+
_documentBuilderOptions = documentBuilderOptionsProvider?.GetDocumentBuilderOptions() ?? new DocumentBuilderOptions(); ;
2424
}
2525

2626
public Document Build(IIdentifiable entity)

src/JsonApiDotNetCore/Builders/DocumentBuilderBehavior.cs renamed to src/JsonApiDotNetCore/Builders/DocumentBuilderOptionsProvider.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66

77
namespace JsonApiDotNetCore.Builders
88
{
9-
public class DocumentBuilderBehavior : IDocumentBuilderBehavior
9+
public class DocumentBuilderOptionsProvider : IDocumentBuilderOptionsProvider
1010
{
1111
private readonly IJsonApiContext _jsonApiContext;
1212
private readonly IHttpContextAccessor _httpContextAccessor;
1313

14-
public DocumentBuilderBehavior(IJsonApiContext jsonApiContext, IHttpContextAccessor httpContextAccessor)
14+
public DocumentBuilderOptionsProvider(IJsonApiContext jsonApiContext, IHttpContextAccessor httpContextAccessor)
1515
{
16-
this._jsonApiContext = jsonApiContext;
17-
this._httpContextAccessor = httpContextAccessor;
16+
_jsonApiContext = jsonApiContext;
17+
_httpContextAccessor = httpContextAccessor;
1818
}
1919

2020
public DocumentBuilderOptions GetDocumentBuilderOptions()

src/JsonApiDotNetCore/Builders/IDocumentBuilderBehavior.cs renamed to src/JsonApiDotNetCore/Builders/IDocumentBuilderOptionsProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace JsonApiDotNetCore.Builders
66
{
7-
public interface IDocumentBuilderBehavior
7+
public interface IDocumentBuilderOptionsProvider
88
{
99
DocumentBuilderOptions GetDocumentBuilderOptions();
1010
}

src/JsonApiDotNetCore/Extensions/IServiceCollectionExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ public static void AddJsonApiInternals(
112112
services.AddScoped<IQueryAccessor, QueryAccessor>();
113113
services.AddScoped<IQueryParser, QueryParser>();
114114
services.AddScoped<IControllerContext, Services.ControllerContext>();
115-
services.AddScoped<IDocumentBuilderBehavior, DocumentBuilderBehavior>();
115+
services.AddScoped<IDocumentBuilderOptionsProvider, DocumentBuilderOptionsProvider>();
116116
}
117117

118118
public static void SerializeAsJsonApi(this MvcOptions options, JsonApiOptions jsonApiOptions)

test/UnitTests/Builders/DocumentBuilderBehaviour_Tests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void CheckNullBehaviorCombination(bool? omitNullValuedAttributes, bool? a
6363
var httpContextAccessorMock = new Mock<IHttpContextAccessor>();
6464
httpContextAccessorMock.SetupGet(m => m.HttpContext).Returns(httpContext);
6565

66-
var sut = new DocumentBuilderBehavior(jsonApiContextMock.Object, httpContextAccessorMock.Object);
66+
var sut = new DocumentBuilderOptionsProvider(jsonApiContextMock.Object, httpContextAccessorMock.Object);
6767
var documentBuilderOptions = sut.GetDocumentBuilderOptions();
6868

6969
Assert.Equal(omitsNulls, documentBuilderOptions.OmitNullValuedAttributes);

test/UnitTests/Builders/DocumentBuilder_Tests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ public void DocumentBuilderOptions(bool? omitNullValuedAttributes,
155155
string attributeValue,
156156
bool resultContainsAttribute)
157157
{
158-
var documentBuilderBehaviourMock = new Mock<IDocumentBuilderBehavior>();
158+
var documentBuilderBehaviourMock = new Mock<IDocumentBuilderOptionsProvider>();
159159
if (omitNullValuedAttributes.HasValue)
160160
{
161161
documentBuilderBehaviourMock.Setup(m => m.GetDocumentBuilderOptions())

0 commit comments

Comments
 (0)