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

CHanges back to IConsentService but keeps method name changes

Browse Source
This commit is contained in:
Shannon
2018-02-26 21:56:00 +11:00
parent bdea519770
commit 2c5b37a842
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Core/Services/LawfulDataProcessService.cs → src/Umbraco.Core/Services/ConsentService.cs
View File

@@ -12,12 +12,12 @@ namespace Umbraco.Core.Services
/// <summary>
/// Implements <see cref="IContentService"/>.
/// </summary>
internal class LawfulDataProcessService : ScopeRepositoryService, ILawfulDataProcessService
internal class ConsentService : ScopeRepositoryService, IConsentService
{
/// <summary>
/// Initializes a new instance of the <see cref="ContentService"/> class.
/// </summary>
public LawfulDataProcessService(IScopeUnitOfWorkProvider provider, RepositoryFactory repositoryFactory, ILogger logger, IEventMessagesFactory eventMessagesFactory)
public ConsentService(IScopeUnitOfWorkProvider provider, RepositoryFactory repositoryFactory, ILogger logger, IEventMessagesFactory eventMessagesFactory)
: base(provider, repositoryFactory, logger, eventMessagesFactory)
{ }

2
src/Umbraco.Core/Services/ILawfulDataProcessService.cs → src/Umbraco.Core/Services/IConsentService.cs
View File

@@ -14,7 +14,7 @@ namespace Umbraco.Core.Services
/// <para>Getter methods return the current state of a consent, i.e. the latest <see cref="IConsent"/>
/// entity that was created.</para>
/// </remarks>
public interface ILawfulDataProcessService : IService
public interface IConsentService : IService
{
/// <summary>
/// Registers consent.

12
src/Umbraco.Core/Services/ServiceContext.cs
View File

@@ -62,7 +62,7 @@ namespace Umbraco.Core.Services
private Lazy<INotificationService> _notificationService;
private Lazy<IExternalLoginService> _externalLoginService;
private Lazy<IRedirectUrlService> _redirectUrlService;
private Lazy<ILawfulDataProcessService> _consentService;
private Lazy<IConsentService> _consentService;
internal IdkMap IdkMap { get; private set; }
@@ -96,7 +96,7 @@ namespace Umbraco.Core.Services
IExternalLoginService externalLoginService = null,
IMigrationEntryService migrationEntryService = null,
IRedirectUrlService redirectUrlService = null,
ILawfulDataProcessService lawfulDataProcessService = null)
IConsentService consentService = null)
{
if (migrationEntryService != null) _migrationEntryService = new Lazy<IMigrationEntryService>(() => migrationEntryService);
if (externalLoginService != null) _externalLoginService = new Lazy<IExternalLoginService>(() => externalLoginService);
@@ -124,7 +124,7 @@ namespace Umbraco.Core.Services
if (macroService != null) _macroService = new Lazy<IMacroService>(() => macroService);
if (publicAccessService != null) _publicAccessService = new Lazy<IPublicAccessService>(() => publicAccessService);
if (redirectUrlService != null) _redirectUrlService = new Lazy<IRedirectUrlService>(() => redirectUrlService);
if (lawfulDataProcessService != null) _consentService = new Lazy<ILawfulDataProcessService>(() => lawfulDataProcessService);
if (consentService != null) _consentService = new Lazy<IConsentService>(() => consentService);
}
/// <summary>
@@ -289,7 +289,7 @@ namespace Umbraco.Core.Services
_redirectUrlService = new Lazy<IRedirectUrlService>(() => new RedirectUrlService(provider, repositoryFactory, logger, eventMessagesFactory));
if (_consentService == null)
_consentService = new Lazy<ILawfulDataProcessService>(() => new LawfulDataProcessService(provider, repositoryFactory, logger, eventMessagesFactory));
_consentService = new Lazy<IConsentService>(() => new ConsentService(provider, repositoryFactory, logger, eventMessagesFactory));
}
internal IEventMessagesFactory EventMessagesFactory { get; private set; }
@@ -508,8 +508,8 @@ namespace Umbraco.Core.Services
}
/// <summary>
/// Gets the <see cref="ILawfulDataProcessService"/> implementation.
/// Gets the <see cref="IConsentService"/> implementation.
/// </summary>
public ILawfulDataProcessService LawfulDataProcessService => _consentService.Value;
public IConsentService ConsentService => _consentService.Value;
}
}

4
src/Umbraco.Core/Umbraco.Core.csproj
View File

@@ -748,10 +748,10 @@
<Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenThreeZero\CreateCacheInstructionTable.cs" />
<Compile Include="Persistence\Migrations\Upgrades\TargetVersionSevenThreeZero\MigrateStylesheetDataToFile.cs" />
<Compile Include="Services\AuditService.cs" />
<Compile Include="Services\LawfulDataProcessService.cs" />
<Compile Include="Services\ConsentService.cs" />
<Compile Include="Services\ContentTypeServiceExtensions.cs" />
<Compile Include="Models\RedirectUrl.cs" />
<Compile Include="Services\ILawfulDataProcessService.cs" />
<Compile Include="Services\IConsentService.cs" />
<Compile Include="Services\IContentServiceBase.cs" />
<Compile Include="Services\IdkMap.cs" />
<Compile Include="Services\MediaServiceExtensions.cs" />

4
src/Umbraco.Tests/Services/LawfulDataProcessServiceTests.cs → src/Umbraco.Tests/Services/ConsentServiceTests.cs
View File

@@ -10,7 +10,7 @@ namespace Umbraco.Tests.Services
{
[TestFixture]
[DatabaseTestBehavior(DatabaseBehavior.NewDbFileAndSchemaPerFixture)]
public class LawfulDataProcessServiceTests : BaseServiceTest
public class ConsentServiceTests : BaseServiceTest
{
[SetUp]
public override void Initialize()
@@ -30,7 +30,7 @@ namespace Umbraco.Tests.Services
// fixme - why isn't this set by the test base class?
Database.Mapper = new PetaPocoMapper();
var consentService = ServiceContext.LawfulDataProcessService;
var consentService = ServiceContext.ConsentService;
// can register

2
src/Umbraco.Tests/Umbraco.Tests.csproj
View File

@@ -191,7 +191,7 @@
<Compile Include="Packaging\PackageExtractionTests.cs" />
<Compile Include="Persistence\Repositories\SimilarNodeNameTests.cs" />
<Compile Include="Services\AuditServiceTests.cs" />
<Compile Include="Services\LawfulDataProcessServiceTests.cs" />
<Compile Include="Services\ConsentServiceTests.cs" />
<Compile Include="TestHelpers\ControllerTesting\AuthenticateEverythingExtensions.cs" />
<Compile Include="TestHelpers\ControllerTesting\AuthenticateEverythingMiddleware.cs" />
<Compile Include="TestHelpers\ControllerTesting\SpecificAssemblyResolver.cs" />