Skip to content

Commit

Permalink
change some properties
Browse files Browse the repository at this point in the history
  • Loading branch information
xuzhg committed Dec 17, 2020
1 parent 00342e0 commit 5309f7f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 29 deletions.
23 changes: 5 additions & 18 deletions src/Microsoft.AspNetCore.OData/Results/CreatedODataResult.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,32 +20,19 @@ namespace Microsoft.AspNetCore.OData.Results
/// generates an OData-EntityId header.</remarks>
public class CreatedODataResult<T> : ActionResult
{
private readonly T _innerResult;

/// <summary>
/// Initializes a new instance of the <see cref="CreatedODataResult{T}"/> class.
/// </summary>
/// <param name="entity">The created entity.</param>
public CreatedODataResult(T entity)
{
if (entity == null)
{
throw Error.ArgumentNull(nameof(entity));
}

this._innerResult = entity;
Entity = entity ?? throw Error.ArgumentNull(nameof(entity));
}

/// <summary>
/// Gets the entity that was created.
/// </summary>
public virtual T Entity
{
get
{
return _innerResult;
}
}
public virtual T Entity { get; }

/// <inheritdoc/>
public async override Task ExecuteResultAsync(ActionContext context)
Expand Down Expand Up @@ -76,7 +63,7 @@ internal IActionResult GetInnerActionResult(HttpRequest request)
}
else
{
ObjectResult objectResult = new ObjectResult(_innerResult)
ObjectResult objectResult = new ObjectResult(Entity)
{
StatusCode = StatusCodes.Status201Created
};
Expand All @@ -88,13 +75,13 @@ internal IActionResult GetInnerActionResult(HttpRequest request)
// internal just for unit test.
internal Uri GenerateEntityId(HttpRequest request)
{
return ResultHelpers.GenerateODataLink(request, _innerResult, isEntityId: true);
return ResultHelpers.GenerateODataLink(request, Entity, isEntityId: true);
}

// internal just for unit test.
internal Uri GenerateLocationHeader(HttpRequest request)
{
return ResultHelpers.GenerateODataLink(request, _innerResult, isEntityId: false);
return ResultHelpers.GenerateODataLink(request, Entity, isEntityId: false);
}
}
}
14 changes: 3 additions & 11 deletions src/Microsoft.AspNetCore.OData/Results/UpdatedODataResult.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,27 +18,19 @@ namespace Microsoft.AspNetCore.OData.Results
/// <remarks>This action result handles content negotiation and the HTTP prefer header.</remarks>
public class UpdatedODataResult<T> : ActionResult
{
private readonly T _innerResult;

/// <summary>
/// Initializes a new instance of the <see cref="UpdatedODataResult{T}"/> class.
/// </summary>
/// <param name="entity">The updated entity.</param>
public UpdatedODataResult(T entity)
{
this._innerResult = entity ?? throw new ArgumentNullException(nameof(entity));
Entity = entity ?? throw new ArgumentNullException(nameof(entity));
}

/// <summary>
/// Gets the entity that was updated.
/// </summary>
public virtual T Entity
{
get
{
return _innerResult;
}
}
public virtual T Entity { get; }

/// <inheritdoc/>
public async override Task ExecuteResultAsync(ActionContext context)
Expand All @@ -59,7 +51,7 @@ internal IActionResult GetInnerActionResult(HttpRequest request)
{
if (RequestPreferenceHelpers.RequestPrefersReturnContent(request.Headers))
{
ObjectResult objectResult = new ObjectResult(_innerResult)
ObjectResult objectResult = new ObjectResult(Entity)
{
StatusCode = StatusCodes.Status200OK
};
Expand Down

0 comments on commit 5309f7f

Please sign in to comment.