diff --git a/src/Umbraco.Core/Services/IMediaService.cs b/src/Umbraco.Core/Services/IMediaService.cs index ac161018ba..8759d9d790 100644 --- a/src/Umbraco.Core/Services/IMediaService.cs +++ b/src/Umbraco.Core/Services/IMediaService.cs @@ -237,14 +237,7 @@ namespace Umbraco.Core.Services /// Id of the Media's new Parent /// Id of the User moving the Media void Move(IMedia media, int parentId, int userId = 0); - - /// - /// Deletes an object by moving it to the Recycle Bin - /// - /// The to delete - /// Id of the User deleting the Media - void MoveToRecycleBin(IMedia media, int userId = 0); - + /// /// Empties the Recycle Bin by deleting all that resides in the bin /// @@ -265,34 +258,7 @@ namespace Umbraco.Core.Services /// Ids of the s /// Optional Id of the user issueing the delete operation void DeleteMediaOfTypes(IEnumerable mediaTypeIds, int userId = 0); - - /// - /// Permanently deletes an object - /// - /// - /// Please note that this method will completely remove the Media from the database, - /// but current not from the file system. - /// - /// The to delete - /// Id of the User deleting the Media - void Delete(IMedia media, int userId = 0); - - /// - /// Saves a single object - /// - /// The to save - /// Id of the User saving the Media - /// Optional boolean indicating whether or not to raise events. - void Save(IMedia media, int userId = 0, bool raiseEvents = true); - - /// - /// Saves a collection of objects - /// - /// Collection of to save - /// Id of the User saving the Media - /// Optional boolean indicating whether or not to raise events. - void Save(IEnumerable medias, int userId = 0, bool raiseEvents = true); - + /// /// Gets an object by its 'UniqueId' /// diff --git a/src/Umbraco.Core/Services/Implement/MediaService.cs b/src/Umbraco.Core/Services/Implement/MediaService.cs index 504750874c..f1c70b92ad 100644 --- a/src/Umbraco.Core/Services/Implement/MediaService.cs +++ b/src/Umbraco.Core/Services/Implement/MediaService.cs @@ -743,16 +743,6 @@ namespace Umbraco.Core.Services.Implement #region Save - /// - /// Saves a single object - /// - /// The to save - /// Id of the User saving the Media - /// Optional boolean indicating whether or not to raise events. - public void Save(IMedia media, int userId = 0, bool raiseEvents = true) - { - ((IMediaServiceOperations) this).Save(media, userId, raiseEvents); - } /// /// Saves a single object @@ -859,21 +849,7 @@ namespace Umbraco.Core.Services.Implement #endregion #region Delete - - /// - /// Permanently deletes an object as well as all of its Children. - /// - /// - /// Please note that this method will completely remove the Media from the database, - /// as well as associated media files from the file system. - /// - /// The to delete - /// Id of the User deleting the Media - public void Delete(IMedia media, int userId = 0) - { - ((IMediaServiceOperations) this).Delete(media, userId); - } - + /// /// Permanently deletes an object /// @@ -1029,16 +1005,6 @@ namespace Umbraco.Core.Services.Implement #region Move, RecycleBin - /// - /// Deletes an object by moving it to the Recycle Bin - /// - /// The to delete - /// Id of the User deleting the Media - public void MoveToRecycleBin(IMedia media, int userId = 0) - { - ((IMediaServiceOperations) this).MoveToRecycleBin(media, userId); - } - /// /// Deletes an object by moving it to the Recycle Bin /// @@ -1090,7 +1056,7 @@ namespace Umbraco.Core.Services.Implement // if moving to the recycle bin then use the proper method if (parentId == Constants.System.RecycleBinMedia) { - MoveToRecycleBin(media, userId); + ((IMediaServiceOperations)this).MoveToRecycleBin(media, userId); return; } diff --git a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs index 42e8a0ef5c..87759db3df 100644 --- a/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs +++ b/src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs @@ -15,6 +15,7 @@ using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Repositories.Implement; using Umbraco.Core.Scoping; using Umbraco.Tests.Testing; +using Umbraco.Core.Services; namespace Umbraco.Tests.Persistence.Repositories { diff --git a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs index 3551896c2b..b9d106ca1b 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs @@ -22,6 +22,7 @@ using Current = Umbraco.Web.Composing.Current; using Umbraco.Tests.Testing; using LightInject; using Umbraco.Core.Models.Membership; +using Umbraco.Core.Services; namespace Umbraco.Tests.PublishedContent { diff --git a/src/Umbraco.Tests/Services/EntityServiceTests.cs b/src/Umbraco.Tests/Services/EntityServiceTests.cs index 6abe5add94..627adff6d5 100644 --- a/src/Umbraco.Tests/Services/EntityServiceTests.cs +++ b/src/Umbraco.Tests/Services/EntityServiceTests.cs @@ -6,6 +6,7 @@ using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Models; using Umbraco.Core.Models.Entities; +using Umbraco.Core.Services; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.TestHelpers.Entities; using Umbraco.Tests.Testing; diff --git a/src/Umbraco.Tests/Services/MediaServiceTests.cs b/src/Umbraco.Tests/Services/MediaServiceTests.cs index 814a4af4ab..1329438c7b 100644 --- a/src/Umbraco.Tests/Services/MediaServiceTests.cs +++ b/src/Umbraco.Tests/Services/MediaServiceTests.cs @@ -10,6 +10,7 @@ using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.DatabaseModelDefinitions; using Umbraco.Core.Persistence.Dtos; using Umbraco.Core.Persistence.Repositories; +using Umbraco.Core.Services; using Umbraco.Tests.TestHelpers; using Umbraco.Tests.TestHelpers.Entities; using Umbraco.Tests.Testing; @@ -33,9 +34,9 @@ namespace Umbraco.Tests.Services for (int i = 0; i < 10; i++) { var m1 = MockedMedia.CreateMediaImage(mediaType1, -1); - mediaService.Save(m1); + ((IMediaServiceOperations)(mediaService)).Save(m1); var m2 = MockedMedia.CreateMediaImage(mediaType2, -1); - mediaService.Save(m2); + ((IMediaServiceOperations)(mediaService)).Save(m2); } long total; @@ -73,7 +74,7 @@ namespace Umbraco.Tests.Services var media = mediaService.GetById(mediaItems.Item1.Id); // Act - mediaService.MoveToRecycleBin(media); + ((IMediaServiceOperations)mediaService).MoveToRecycleBin(media); // Assert Assert.That(media.ParentId, Is.EqualTo(-21)); @@ -109,7 +110,7 @@ namespace Umbraco.Tests.Services var media = mediaService.CreateMedia(string.Empty, -1, "video"); // Act & Assert - Assert.Throws(() => mediaService.Save(media)); + Assert.Throws(() => ((IMediaServiceOperations)(mediaService)).Save(media)); } [Test] @@ -120,7 +121,7 @@ namespace Umbraco.Tests.Services ServiceContext.MediaTypeService.Save(mediaType); var media = mediaService.CreateMedia("Test", -1, "video"); - mediaService.Save(media); + ((IMediaServiceOperations)(mediaService)).Save(media); using (var scope = ScopeProvider.CreateScope()) { @@ -136,7 +137,7 @@ namespace Umbraco.Tests.Services ServiceContext.MediaTypeService.Save(mediaType); var media = MockedMedia.CreateMediaImage(mediaType, -1); - mediaService.Save(media); + ((IMediaServiceOperations)(mediaService)).Save(media); var mediaPath = "/media/test-image.png"; var resolvedMedia = mediaService.GetMediaByPath(mediaPath); @@ -153,7 +154,7 @@ namespace Umbraco.Tests.Services ServiceContext.MediaTypeService.Save(mediaType); var media = MockedMedia.CreateMediaImageWithCrop(mediaType, -1); - mediaService.Save(media); + ((IMediaServiceOperations)(mediaService)).Save(media); var mediaPath = "/media/test-image.png"; var resolvedMedia = mediaService.GetMediaByPath(mediaPath); @@ -170,7 +171,7 @@ namespace Umbraco.Tests.Services for (int i = 0; i < 10; i++) { var c1 = MockedMedia.CreateMediaImage(mediaType, -1); - ServiceContext.MediaService.Save(c1); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(c1); } var service = ServiceContext.MediaService; @@ -193,17 +194,17 @@ namespace Umbraco.Tests.Services for (int i = 0; i < 9; i++) { var m1 = MockedMedia.CreateMediaImage(mediaType, -1); - ServiceContext.MediaService.Save(m1); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(m1); } var mediaTypeForFolder = MockedContentTypes.CreateImageMediaType("Folder2"); ServiceContext.MediaTypeService.Save(mediaTypeForFolder); var mediaFolder = MockedMedia.CreateMediaFolder(mediaTypeForFolder, -1); - ServiceContext.MediaService.Save(mediaFolder); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(mediaFolder); for (int i = 0; i < 10; i++) { var m1 = MockedMedia.CreateMediaImage(mediaType, mediaFolder.Id); - ServiceContext.MediaService.Save(m1); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(m1); } var service = ServiceContext.MediaService; @@ -231,26 +232,26 @@ namespace Umbraco.Tests.Services //Create and Save folder-Media -> 1050 var folderMediaType = ServiceContext.MediaTypeService.Get(1031); var folder = MockedMedia.CreateMediaFolder(folderMediaType, -1); - ServiceContext.MediaService.Save(folder); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(folder); //Create and Save folder-Media -> 1051 var folder2 = MockedMedia.CreateMediaFolder(folderMediaType, -1); - ServiceContext.MediaService.Save(folder2); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(folder2); //Create and Save image-Media -> 1052 var imageMediaType = ServiceContext.MediaTypeService.Get(1032); var image = (Media)MockedMedia.CreateMediaImage(imageMediaType, 1050); - ServiceContext.MediaService.Save(image); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(image); //Create and Save folder-Media that is trashed -> 1053 var folderTrashed = (Media)MockedMedia.CreateMediaFolder(folderMediaType, -21); folderTrashed.Trashed = true; - ServiceContext.MediaService.Save(folderTrashed); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(folderTrashed); //Create and Save image-Media child of folderTrashed -> 1054 var imageTrashed = (Media)MockedMedia.CreateMediaImage(imageMediaType, folderTrashed.Id); imageTrashed.Trashed = true; - ServiceContext.MediaService.Save(imageTrashed); + ((IMediaServiceOperations)(ServiceContext.MediaService)).Save(imageTrashed); return new Tuple(folder, folder2, image, folderTrashed, imageTrashed); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs index d1efa5feea..f73975a26b 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs @@ -9,6 +9,7 @@ using Umbraco.Web.WebServices; using Umbraco.Core.Models.Membership; using Umbraco.Web.Composing; using Umbraco.Web._Legacy.UI; +using Umbraco.Core.Services; namespace umbraco.presentation.webservices {