Skip to content

Cleanup of public overloads for ILoggerFactory #674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Feb 13, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
9 changes: 5 additions & 4 deletions src/Examples/GettingStarted/Controllers/ArticlesController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@
using JsonApiDotNetCore.Configuration;
using JsonApiDotNetCore.Controllers;
using JsonApiDotNetCore.Services;
using Microsoft.Extensions.Logging;

namespace GettingStarted
{
public class ArticlesController : JsonApiController<Article>
{
public ArticlesController(
IJsonApiOptions jsonApiOptions,
public ArticlesController(IJsonApiOptions jsonApiOptions, ILoggerFactory loggerFactory,
IResourceService<Article> resourceService)
: base(jsonApiOptions, resourceService)
{ }
: base(jsonApiOptions, loggerFactory, resourceService)
{
}
}
}
9 changes: 5 additions & 4 deletions src/Examples/GettingStarted/Controllers/PeopleController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@
using JsonApiDotNetCore.Configuration;
using JsonApiDotNetCore.Controllers;
using JsonApiDotNetCore.Services;
using Microsoft.Extensions.Logging;

namespace GettingStarted
{
public class PeopleController : JsonApiController<Person>
{
public PeopleController(
IJsonApiOptions jsonApiOptions,
public PeopleController(IJsonApiOptions jsonApiOptions, ILoggerFactory loggerFactory,
IResourceService<Person> resourceService)
: base(jsonApiOptions, resourceService)
{ }
: base(jsonApiOptions, loggerFactory, resourceService)
{
}
}
}
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
using JsonApiDotNetCore.Configuration;
using JsonApiDotNetCore.Controllers;
using JsonApiDotNetCore.Services;
using Microsoft.Extensions.Logging;

namespace GettingStarted.ResourceDefinitionExample
{
public class ModelsController : JsonApiController<Model>
{
public ModelsController(
IJsonApiOptions jsonApiOptions,
public ModelsController(IJsonApiOptions jsonApiOptions, ILoggerFactory loggerFactory,
IResourceService<Model> resourceService)
: base(jsonApiOptions, resourceService)
{ }
: base(jsonApiOptions, loggerFactory, resourceService)
{
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@
using JsonApiDotNetCore.Controllers;
using JsonApiDotNetCore.Services;
using JsonApiDotNetCoreExample.Models;
using Microsoft.Extensions.Logging;

namespace JsonApiDotNetCoreExample.Controllers
{
public class ArticlesController : JsonApiController<Article>
{
public ArticlesController(
IJsonApiOptions jsonApiOptions,
IResourceService<Article> resourceService)
: base(jsonApiOptions, resourceService)
{ }
public ArticlesController(IJsonApiOptions jsonApiOptions, ILoggerFactory loggerFactory,
IResourceService<Article> resourceService)
: base(jsonApiOptions, loggerFactory, resourceService)
{
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ namespace JsonApiDotNetCoreExample.Controllers
{
public class KebabCasedModelsController : JsonApiController<KebabCasedModel>
{
public KebabCasedModelsController(
IJsonApiOptions jsonApiOptions,
IResourceService<KebabCasedModel> resourceService,
ILoggerFactory loggerFactory)
: base(jsonApiOptions, resourceService, loggerFactory)
{ }
public KebabCasedModelsController(IJsonApiOptions jsonApiOptions, ILoggerFactory loggerFactory,
IResourceService<KebabCasedModel> resourceService)
: base(jsonApiOptions, loggerFactory, resourceService)
{
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@ namespace JsonApiDotNetCoreExample.Controllers
{
public class PassportsController : JsonApiController<Passport>
{
public PassportsController(IJsonApiOptions jsonApiOptions,
IResourceService<Passport, int> resourceService,
ILoggerFactory loggerFactory = null)
: base(jsonApiOptions, resourceService, loggerFactory)
public PassportsController(IJsonApiOptions jsonApiOptions, ILoggerFactory loggerFactory,
IResourceService<Passport, int> resourceService)
: base(jsonApiOptions, loggerFactory, resourceService)
{
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ namespace JsonApiDotNetCoreExample.Controllers
{
public class PeopleController : JsonApiController<Person>
{
public PeopleController(
IJsonApiOptions jsonApiOptions,
IResourceService<Person> resourceService,
ILoggerFactory loggerFactory)
: base(jsonApiOptions, resourceService, loggerFactory)
{ }
public PeopleController(IJsonApiOptions jsonApiOptions, ILoggerFactory loggerFactory,
IResourceService<Person> resourceService)
: base(jsonApiOptions, loggerFactory, resourceService)
{
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ namespace JsonApiDotNetCoreExample.Controllers
{
public class PersonRolesController : JsonApiController<PersonRole>
{
public PersonRolesController(
IJsonApiOptions jsonApiOptions,
IResourceService<PersonRole> resourceService,
ILoggerFactory loggerFactory)
: base(jsonApiOptions, resourceService, loggerFactory)
{ }
public PersonRolesController(IJsonApiOptions jsonApiOptions, ILoggerFactory loggerFactory,
IResourceService<PersonRole> resourceService)
: base(jsonApiOptions, loggerFactory, resourceService)
{
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,9 @@ public class TodoCollectionsController : JsonApiController<TodoItemCollection, G
{
readonly IDbContextResolver _dbResolver;

public TodoCollectionsController(
IJsonApiOptions jsonApiOptions,
IDbContextResolver contextResolver,
IResourceService<TodoItemCollection, Guid> resourceService,
ILoggerFactory loggerFactory)
: base(jsonApiOptions, resourceService, loggerFactory)
public TodoCollectionsController(IJsonApiOptions jsonApiOptions, ILoggerFactory loggerFactory,
IDbContextResolver contextResolver, IResourceService<TodoItemCollection, Guid> resourceService)
: base(jsonApiOptions, loggerFactory, resourceService)
{
_dbResolver = contextResolver;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ namespace JsonApiDotNetCoreExample.Controllers
{
public class TodoItemsController : JsonApiController<TodoItem>
{
public TodoItemsController(
IJsonApiOptions jsonApiOptions,
IResourceService<TodoItem> resourceService,
ILoggerFactory loggerFactory)
: base(jsonApiOptions, resourceService, loggerFactory)
{ }
public TodoItemsController(IJsonApiOptions jsonApiOptions, ILoggerFactory loggerFactory,
IResourceService<TodoItem> resourceService)
: base(jsonApiOptions, loggerFactory, resourceService)
{
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,20 @@ namespace JsonApiDotNetCoreExample.Controllers
public abstract class AbstractTodoItemsController<T>
: JsonApiController<T> where T : class, IIdentifiable<int>
{
protected AbstractTodoItemsController(
IJsonApiOptions jsonApiOptions,
IResourceService<T, int> service,
ILoggerFactory loggerFactory)
: base(jsonApiOptions, service, loggerFactory)
{ }
protected AbstractTodoItemsController(IJsonApiOptions jsonApiOptions, ILoggerFactory loggerFactory,
IResourceService<T, int> service)
: base(jsonApiOptions, loggerFactory, service)
{
}
}

[Route("/abstract")]
public class TodoItemsTestController : AbstractTodoItemsController<TodoItem>
{
public TodoItemsTestController(
IJsonApiOptions jsonApiOptions,
IResourceService<TodoItem> service,
ILoggerFactory loggerFactory)
: base(jsonApiOptions, service, loggerFactory)
{ }
public TodoItemsTestController(IJsonApiOptions jsonApiOptions, ILoggerFactory loggerFactory,
IResourceService<TodoItem> service)
: base(jsonApiOptions, loggerFactory, service)
{
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,19 @@ namespace JsonApiDotNetCoreExample.Controllers
{
public class UsersController : JsonApiController<User>
{
public UsersController(
IJsonApiOptions jsonApiOptions,
IResourceService<User> resourceService,
ILoggerFactory loggerFactory)
: base(jsonApiOptions, resourceService, loggerFactory)
{ }
public UsersController(IJsonApiOptions jsonApiOptions, ILoggerFactory loggerFactory,
IResourceService<User> resourceService)
: base(jsonApiOptions, loggerFactory, resourceService)
{
}
}

public class SuperUsersController : JsonApiController<SuperUser>
{
public SuperUsersController(
IJsonApiOptions jsonApiOptions,
IResourceService<SuperUser> resourceService,
ILoggerFactory loggerFactory)
: base(jsonApiOptions, resourceService, loggerFactory)
{ }
public SuperUsersController(IJsonApiOptions jsonApiOptions, ILoggerFactory loggerFactory,
IResourceService<SuperUser> resourceService)
: base(jsonApiOptions, loggerFactory, resourceService)
{
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@ namespace JsonApiDotNetCoreExample.Services
{
public class CustomArticleService : DefaultResourceService<Article>
{
public CustomArticleService(IEnumerable<IQueryParameterService> queryParameters,
IJsonApiOptions options,
IResourceRepository<Article, int> repository,
IResourceContextProvider provider,
IResourceHookExecutor hookExecutor = null,
ILoggerFactory loggerFactory = null)
: base(queryParameters, options, repository, provider, hookExecutor, loggerFactory) { }
public CustomArticleService(IEnumerable<IQueryParameterService> queryParameters, IJsonApiOptions options,
ILoggerFactory loggerFactory, IResourceRepository<Article, int> repository,
IResourceContextProvider provider, IResourceHookExecutor hookExecutor = null)
: base(queryParameters, options, loggerFactory, repository, provider, hookExecutor)
{
}

public override async Task<Article> GetAsync(int id)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,10 @@ namespace NoEntityFrameworkExample.Controllers
{
public class TodoItemsController : JsonApiController<TodoItem>
{
public TodoItemsController(
IJsonApiOptions jsonApiOptions,
IResourceService<TodoItem> resourceService,
ILoggerFactory loggerFactory)
: base(jsonApiOptions, resourceService, loggerFactory)
{ }
public TodoItemsController(IJsonApiOptions jsonApiOptions, ILoggerFactory loggerFactory,
IResourceService<TodoItem> resourceService)
: base(jsonApiOptions, loggerFactory, resourceService)
{
}
}
}
15 changes: 8 additions & 7 deletions src/Examples/ReportsExample/Controllers/ReportsController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,20 @@
using Microsoft.AspNetCore.Mvc;
using JsonApiDotNetCore.Controllers;
using JsonApiDotNetCore.Services;
using JsonApiDotNetCore.Configuration;
using JsonApiDotNetCore.Internal.Contracts;

using JsonApiDotNetCore.Configuration;
using Microsoft.Extensions.Logging;
using ReportsExample.Models;

namespace ReportsExample.Controllers
{
[Route("api/[controller]")]
public class ReportsController : BaseJsonApiController<Report, int>
{
public ReportsController(
IJsonApiOptions jsonApiOptions,
public ReportsController(IJsonApiOptions jsonApiOptions, ILoggerFactory loggerFactory,
IGetAllService<Report> getAll)
: base(jsonApiOptions, getAll: getAll)
{ }
: base(jsonApiOptions, loggerFactory, getAll)
{
}

[HttpGet]
public override async Task<IActionResult> GetAsync() => await base.GetAsync();
Expand Down
23 changes: 13 additions & 10 deletions src/Examples/ReportsExample/Models/Report.cs
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
using JsonApiDotNetCore.Models;

public class Report : Identifiable
namespace ReportsExample.Models
{
[Attr]
public string Title { get; set; }
public class Report : Identifiable
{
[Attr]
public string Title { get; set; }

[Attr]
public ComplexType ComplexType { get; set; }
}
[Attr]
public ComplexType ComplexType { get; set; }
}

public class ComplexType
{
public string CompoundPropertyName { get; set; }
}
public class ComplexType
{
public string CompoundPropertyName { get; set; }
}
}
Loading