yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove obsolete UmbracoApiControllerBase constructor

Browse Source
This commit is contained in:
Benjamin Carleski
2020-01-20 11:55:04 -08:00
parent 421ed582da
commit 7284ab0400
5 changed files with 7 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Tests/Testing/TestingTests/MockTests.cs
View File

@@ -115,7 +115,6 @@ namespace Umbraco.Tests.Testing.TestingTests
internal class FakeUmbracoApiController : UmbracoApiController
{
public FakeUmbracoApiController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper) : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper) { }
public FakeUmbracoApiController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper, UmbracoMapper umbracoMapper) : base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper) { }
}
}

6
src/Umbraco.Web/Editors/DashboardController.cs
View File

@@ -20,6 +20,7 @@ using Umbraco.Core.Strings;
using Umbraco.Core.Dashboards;
using Umbraco.Core.Strings;
using Umbraco.Web.Services;
using Umbraco.Core.Mapping;
namespace Umbraco.Web.Editors
{
@@ -50,8 +51,9 @@ namespace Umbraco.Web.Editors
IDashboardService dashboardService,
UmbracoHelper umbracoHelper,
IUmbracoVersion umbracoVersion,
IShortStringHelper shortStringHelper)
: base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
IShortStringHelper shortStringHelper,
UmbracoMapper umbracoMapper)
: base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper)
{
_dashboardService = dashboardService;
_umbracoVersion = umbracoVersion;

6
src/Umbraco.Web/WebApi/UmbracoApiController.cs
View File

@@ -19,12 +19,6 @@ namespace Umbraco.Web.WebApi
{
}
[Obsolete("This constructor is obsolete since it doesn't inject the UmbracoMapper. The UmbracoMapper will be resolved from the service locator Current.Mapper, which is not good for testability. Inject the UmbracoMapper using full constructor injection instead.")]
protected UmbracoApiController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper)
: base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
{
}
protected UmbracoApiController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper, UmbracoMapper umbracoMapper)
: base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper)
{

16
src/Umbraco.Web/WebApi/UmbracoApiControllerBase.cs
View File

@@ -61,22 +61,6 @@ namespace Umbraco.Web.WebApi
Mapper = umbracoMapper;
}
[Obsolete("This constructor is obsolete since it doesn't inject the UmbracoMapper. The UmbracoMapper will be resolved from the service locator Current.Mapper, which is not good for testability. Inject the UmbracoMapper using full constructor injection instead.")]
protected UmbracoApiControllerBase(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper)
{
UmbracoContextAccessor = umbracoContextAccessor;
GlobalSettings = globalSettings;
SqlContext = sqlContext;
Services = services;
AppCaches = appCaches;
Logger = logger;
RuntimeState = runtimeState;
Umbraco = umbracoHelper;
// not good for testability, hence the obsolete.
Mapper = Current.Mapper;
}
/// <summary>
/// Gets a unique instance identifier.
/// </summary>

5
src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
View File

@@ -8,6 +8,7 @@ using Umbraco.Core.Persistence;
using Umbraco.Core.Services;
using Umbraco.Web.Models.Identity;
using Umbraco.Web.Security;
using Umbraco.Core.Mapping;
namespace Umbraco.Web.WebApi
{
@@ -35,8 +36,8 @@ namespace Umbraco.Web.WebApi
{
}
protected UmbracoAuthorizedApiController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper)
: base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper)
protected UmbracoAuthorizedApiController(IGlobalSettings globalSettings, IUmbracoContextAccessor umbracoContextAccessor, ISqlContext sqlContext, ServiceContext services, AppCaches appCaches, IProfilingLogger logger, IRuntimeState runtimeState, UmbracoHelper umbracoHelper, UmbracoMapper umbracoMapper)
: base(globalSettings, umbracoContextAccessor, sqlContext, services, appCaches, logger, runtimeState, umbracoHelper, umbracoMapper)
{
}