Renamed interface to prepare for adding GetPagedRollbackVersions

Author: bergmania

src/Umbraco.Core/Composing/CompositionExtensions/Services.cs

@@ -34,7 +34,7 @@ public static Composition ComposeServices(this Composition composition)
 
             composition.RegisterUnique<ContentService>();
             composition.RegisterUnique<IContentService>(factory => factory.GetInstance<ContentService>());
-            composition.RegisterUnique<IContentVersionCleanupService>(factory => factory.GetInstance<ContentService>());
+            composition.RegisterUnique<IContentVersionService>(factory => factory.GetInstance<ContentService>());
             composition.RegisterUnique<IContentVersionCleanupPolicy, DefaultContentVersionCleanupPolicy>();
 
             composition.RegisterUnique<IUserService, UserService>();

src/Umbraco.Core/Services/IContentVersionCleanupService.cs renamed to src/Umbraco.Core/Services/IContentVersionService.cs

@@ -4,7 +4,7 @@
 
 namespace Umbraco.Core.Services
 {
-    public interface IContentVersionCleanupService
+    public interface IContentVersionService
     {
         /// <summary>
         /// Removes historic content versions according to a policy.

src/Umbraco.Core/Services/Implement/ContentService.cs

@@ -19,7 +19,7 @@ namespace Umbraco.Core.Services.Implement
     /// <summary>
     /// Implements the content service.
     /// </summary>
-    public class ContentService : RepositoryService, IContentService, IContentVersionCleanupService
+    public class ContentService : RepositoryService, IContentService, IContentVersionService
     {
         private readonly IDocumentRepository _documentRepository;
         private readonly IEntityRepository _entityRepository;

src/Umbraco.Core/Umbraco.Core.csproj

@@ -199,7 +199,7 @@
     <Compile Include="PropertyEditors\EyeDropperColorPickerConfiguration.cs" />
     <Compile Include="PropertyEditors\ComplexPropertyEditorContentEventHandler.cs" />
     <Compile Include="Services\IContentVersionCleanupPolicy.cs" />
-    <Compile Include="Services\IContentVersionCleanupService.cs" />
+    <Compile Include="Services\IContentVersionService.cs" />
     <Compile Include="Services\IIconService.cs" />
     <Compile Include="Services\Implement\DefaultContentVersionCleanupPolicy.cs" />
     <Compile Include="Services\Implement\InstallationService.cs" />

src/Umbraco.Tests/Scheduling/ContentVersionCleanup_Tests_UnitTests.cs

@@ -18,7 +18,7 @@ class ContentVersionCleanup_Tests_UnitTests
         public void ContentVersionCleanup_WhenNotEnabled_DoesNotCleanupWillRepeat(
             [Frozen] Mock<IContentVersionCleanupPolicyGlobalSettings> settings,
             [Frozen] Mock<IRuntimeState> state,
-            [Frozen] Mock<IContentVersionCleanupService> cleanupService,
+            [Frozen] Mock<IContentVersionService> cleanupService,
             ContentVersionCleanup sut)
         {
             settings.Setup(x => x.EnableCleanup).Returns(false);
@@ -40,7 +40,7 @@ public void ContentVersionCleanup_WhenNotEnabled_DoesNotCleanupWillRepeat(
         public void ContentVersionCleanup_RuntimeLevelNotRun_DoesNotCleanupWillRepeat(
             [Frozen] Mock<IContentVersionCleanupPolicyGlobalSettings> settings,
             [Frozen] Mock<IRuntimeState> state,
-            [Frozen] Mock<IContentVersionCleanupService> cleanupService,
+            [Frozen] Mock<IContentVersionService> cleanupService,
             ContentVersionCleanup sut)
         {
             settings.Setup(x => x.EnableCleanup).Returns(true);
@@ -62,7 +62,7 @@ public void ContentVersionCleanup_RuntimeLevelNotRun_DoesNotCleanupWillRepeat(
         public void ContentVersionCleanup_ServerRoleUnknown_DoesNotCleanupWillRepeat(
             [Frozen] Mock<IContentVersionCleanupPolicyGlobalSettings> settings,
             [Frozen] Mock<IRuntimeState> state,
-            [Frozen] Mock<IContentVersionCleanupService> cleanupService,
+            [Frozen] Mock<IContentVersionService> cleanupService,
             ContentVersionCleanup sut)
         {
             settings.Setup(x => x.EnableCleanup).Returns(true);
@@ -84,7 +84,7 @@ public void ContentVersionCleanup_ServerRoleUnknown_DoesNotCleanupWillRepeat(
         public void ContentVersionCleanup_NotMainDom_DoesNotCleanupWillNotRepeat(
             [Frozen] Mock<IContentVersionCleanupPolicyGlobalSettings> settings,
             [Frozen] Mock<IRuntimeState> state,
-            [Frozen] Mock<IContentVersionCleanupService> cleanupService,
+            [Frozen] Mock<IContentVersionService> cleanupService,
             ContentVersionCleanup sut)
         {
             settings.Setup(x => x.EnableCleanup).Returns(true);
@@ -106,7 +106,7 @@ public void ContentVersionCleanup_NotMainDom_DoesNotCleanupWillNotRepeat(
         public void ContentVersionCleanup_Enabled_DelegatesToCleanupService(
             [Frozen] Mock<IContentVersionCleanupPolicyGlobalSettings> settings,
             [Frozen] Mock<IRuntimeState> state,
-            [Frozen] Mock<IContentVersionCleanupService> cleanupService,
+            [Frozen] Mock<IContentVersionService> cleanupService,
             ContentVersionCleanup sut)
         {
             settings.Setup(x => x.EnableCleanup).Returns(true);

src/Umbraco.Tests/Services/ContentVersionCleanupService_Tests_Integration.cs

@@ -47,7 +47,7 @@ public void PerformContentVersionCleanup_WithNoKeepPeriods_DeletesEverythingExce
             // Kill all historic
             InsertCleanupPolicy(contentTypeA, 0, 0);
 
-            ((IContentVersionCleanupService)ServiceContext.ContentService).PerformContentVersionCleanup(DateTime.Now.AddHours(1));
+            ((IContentVersionService)ServiceContext.ContentService).PerformContentVersionCleanup(DateTime.Now.AddHours(1));
 
             var after = GetReport();
 

src/Umbraco.Web/Scheduling/ContentVersionCleanup.cs

@@ -12,7 +12,7 @@ internal class ContentVersionCleanup : RecurringTaskBase
         private readonly IRuntimeState _runtimeState;
         private readonly IProfilingLogger _logger;
         private readonly IContentVersionCleanupPolicyGlobalSettings _settings;
-        private readonly IContentVersionCleanupService _cleanupService;
+        private readonly IContentVersionService _service;
 
         public ContentVersionCleanup(
             IBackgroundTaskRunner<RecurringTaskBase> runner,
@@ -21,13 +21,13 @@ public ContentVersionCleanup(
             IRuntimeState runtimeState,
             IProfilingLogger logger,
             IContentVersionCleanupPolicyGlobalSettings settings,
-            IContentVersionCleanupService cleanupService)
+            IContentVersionService service)
             : base(runner, delayMilliseconds, periodMilliseconds)
         {
             _runtimeState = runtimeState ?? throw new ArgumentNullException(nameof(runtimeState));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
             _settings = settings ?? throw new ArgumentNullException(nameof(settings));
-            _cleanupService = cleanupService ?? throw new ArgumentNullException(nameof(cleanupService));
+            _service = service ?? throw new ArgumentNullException(nameof(service));
         }
 
         public override bool PerformRun()
@@ -65,7 +65,7 @@ public override bool PerformRun()
                 return false; // do NOT repeat, going down
             }
 
-            var count = _cleanupService.PerformContentVersionCleanup(DateTime.Now).Count;
+            var count = _service.PerformContentVersionCleanup(DateTime.Now).Count;
 
             if (count > 0)
             {

src/Umbraco.Web/Scheduling/SchedulerComponent.cs

@@ -25,7 +25,7 @@ public sealed class SchedulerComponent : IComponent
 
         private readonly IRuntimeState _runtime;
         private readonly IContentService _contentService;
-        private readonly IContentVersionCleanupService _cleanupService;
+        private readonly IContentVersionService _service;
         private readonly IAuditService _auditService;
         private readonly IProfilingLogger _logger;
         private readonly IScopeProvider _scopeProvider;
@@ -48,7 +48,7 @@ public sealed class SchedulerComponent : IComponent
         public SchedulerComponent(
             IRuntimeState runtime,
             IContentService contentService,
-            IContentVersionCleanupService cleanupService,
+            IContentVersionService service,
             IAuditService auditService,
             HealthCheckCollection healthChecks,
             HealthCheckNotificationMethodCollection notifications,
@@ -58,7 +58,7 @@ public SchedulerComponent(
         {
             _runtime = runtime;
             _contentService = contentService;
-            _cleanupService = cleanupService;
+            _service = service;
             _auditService = auditService;
             _scopeProvider = scopeProvider;
             _logger = logger;
@@ -203,7 +203,7 @@ private IBackgroundTask RegisterContentVersionCleanup(IUmbracoSettingsSection se
                 _runtime,
                 _logger,
                 settings.Content.ContentVersionCleanupPolicyGlobalSettings,
-                _cleanupService);
+                _service);
 
             _contentVersionCleanupRunner.TryAdd(task);