From f3aca158fbdb2fa636a5c682c8ce47890affbd3d Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 12 Nov 2019 14:16:50 +1100 Subject: [PATCH] Lots of the repo interfaces moved --- .../Persistence/IQueryRepository.cs | 0 .../Persistence/IReadRepository.cs | 0 .../Persistence/IReadWriteQueryRepository.cs | 0 .../Persistence/IRepository.cs | 0 .../Persistence/IWriteRepository.cs | 0 .../Persistence/Querying/IQuery.cs | 0 .../Persistence/Repositories/IAuditRepository.cs | 1 - .../Repositories/IPartialViewMacroRepository.cs | 0 .../Repositories/IPartialViewRepository.cs | 0 .../Persistence/Repositories/IScriptRepository.cs | 0 .../Repositories/IStylesheetRepository.cs | 0 .../Persistence/Repositories/ITemplateRepository.cs | 0 src/Umbraco.Core/Services/Implement/MemberService.cs | 4 +--- src/Umbraco.Core/Umbraco.Core.csproj | 12 ------------ src/Umbraco.Tests/TestHelpers/TestObjects.cs | 2 +- 15 files changed, 2 insertions(+), 17 deletions(-) rename src/{Umbraco.Core => Umbraco.Abstractions}/Persistence/IQueryRepository.cs (100%) rename src/{Umbraco.Core => Umbraco.Abstractions}/Persistence/IReadRepository.cs (100%) rename src/{Umbraco.Core => Umbraco.Abstractions}/Persistence/IReadWriteQueryRepository.cs (100%) rename src/{Umbraco.Core => Umbraco.Abstractions}/Persistence/IRepository.cs (100%) rename src/{Umbraco.Core => Umbraco.Abstractions}/Persistence/IWriteRepository.cs (100%) rename src/{Umbraco.Core => Umbraco.Abstractions}/Persistence/Querying/IQuery.cs (100%) rename src/{Umbraco.Core => Umbraco.Abstractions}/Persistence/Repositories/IAuditRepository.cs (96%) rename src/{Umbraco.Core => Umbraco.Abstractions}/Persistence/Repositories/IPartialViewMacroRepository.cs (100%) rename src/{Umbraco.Core => Umbraco.Abstractions}/Persistence/Repositories/IPartialViewRepository.cs (100%) rename src/{Umbraco.Core => Umbraco.Abstractions}/Persistence/Repositories/IScriptRepository.cs (100%) rename src/{Umbraco.Core => Umbraco.Abstractions}/Persistence/Repositories/IStylesheetRepository.cs (100%) rename src/{Umbraco.Core => Umbraco.Abstractions}/Persistence/Repositories/ITemplateRepository.cs (100%) diff --git a/src/Umbraco.Core/Persistence/IQueryRepository.cs b/src/Umbraco.Abstractions/Persistence/IQueryRepository.cs similarity index 100% rename from src/Umbraco.Core/Persistence/IQueryRepository.cs rename to src/Umbraco.Abstractions/Persistence/IQueryRepository.cs diff --git a/src/Umbraco.Core/Persistence/IReadRepository.cs b/src/Umbraco.Abstractions/Persistence/IReadRepository.cs similarity index 100% rename from src/Umbraco.Core/Persistence/IReadRepository.cs rename to src/Umbraco.Abstractions/Persistence/IReadRepository.cs diff --git a/src/Umbraco.Core/Persistence/IReadWriteQueryRepository.cs b/src/Umbraco.Abstractions/Persistence/IReadWriteQueryRepository.cs similarity index 100% rename from src/Umbraco.Core/Persistence/IReadWriteQueryRepository.cs rename to src/Umbraco.Abstractions/Persistence/IReadWriteQueryRepository.cs diff --git a/src/Umbraco.Core/Persistence/IRepository.cs b/src/Umbraco.Abstractions/Persistence/IRepository.cs similarity index 100% rename from src/Umbraco.Core/Persistence/IRepository.cs rename to src/Umbraco.Abstractions/Persistence/IRepository.cs diff --git a/src/Umbraco.Core/Persistence/IWriteRepository.cs b/src/Umbraco.Abstractions/Persistence/IWriteRepository.cs similarity index 100% rename from src/Umbraco.Core/Persistence/IWriteRepository.cs rename to src/Umbraco.Abstractions/Persistence/IWriteRepository.cs diff --git a/src/Umbraco.Core/Persistence/Querying/IQuery.cs b/src/Umbraco.Abstractions/Persistence/Querying/IQuery.cs similarity index 100% rename from src/Umbraco.Core/Persistence/Querying/IQuery.cs rename to src/Umbraco.Abstractions/Persistence/Querying/IQuery.cs diff --git a/src/Umbraco.Core/Persistence/Repositories/IAuditRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/IAuditRepository.cs similarity index 96% rename from src/Umbraco.Core/Persistence/Repositories/IAuditRepository.cs rename to src/Umbraco.Abstractions/Persistence/Repositories/IAuditRepository.cs index b2dd6a3297..fbd9ec2e13 100644 --- a/src/Umbraco.Core/Persistence/Repositories/IAuditRepository.cs +++ b/src/Umbraco.Abstractions/Persistence/Repositories/IAuditRepository.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using Umbraco.Core.Models; -using Umbraco.Core.Persistence.DatabaseModelDefinitions; using Umbraco.Core.Persistence.Querying; namespace Umbraco.Core.Persistence.Repositories diff --git a/src/Umbraco.Core/Persistence/Repositories/IPartialViewMacroRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/IPartialViewMacroRepository.cs similarity index 100% rename from src/Umbraco.Core/Persistence/Repositories/IPartialViewMacroRepository.cs rename to src/Umbraco.Abstractions/Persistence/Repositories/IPartialViewMacroRepository.cs diff --git a/src/Umbraco.Core/Persistence/Repositories/IPartialViewRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/IPartialViewRepository.cs similarity index 100% rename from src/Umbraco.Core/Persistence/Repositories/IPartialViewRepository.cs rename to src/Umbraco.Abstractions/Persistence/Repositories/IPartialViewRepository.cs diff --git a/src/Umbraco.Core/Persistence/Repositories/IScriptRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/IScriptRepository.cs similarity index 100% rename from src/Umbraco.Core/Persistence/Repositories/IScriptRepository.cs rename to src/Umbraco.Abstractions/Persistence/Repositories/IScriptRepository.cs diff --git a/src/Umbraco.Core/Persistence/Repositories/IStylesheetRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/IStylesheetRepository.cs similarity index 100% rename from src/Umbraco.Core/Persistence/Repositories/IStylesheetRepository.cs rename to src/Umbraco.Abstractions/Persistence/Repositories/IStylesheetRepository.cs diff --git a/src/Umbraco.Core/Persistence/Repositories/ITemplateRepository.cs b/src/Umbraco.Abstractions/Persistence/Repositories/ITemplateRepository.cs similarity index 100% rename from src/Umbraco.Core/Persistence/Repositories/ITemplateRepository.cs rename to src/Umbraco.Abstractions/Persistence/Repositories/ITemplateRepository.cs diff --git a/src/Umbraco.Core/Services/Implement/MemberService.cs b/src/Umbraco.Core/Services/Implement/MemberService.cs index 2180b02bfa..fa45771e6f 100644 --- a/src/Umbraco.Core/Services/Implement/MemberService.cs +++ b/src/Umbraco.Core/Services/Implement/MemberService.cs @@ -28,14 +28,13 @@ namespace Umbraco.Core.Services.Implement private readonly IAuditRepository _auditRepository; private readonly IMemberGroupService _memberGroupService; - private readonly IMediaFileSystem _mediaFileSystem; //only for unit tests! internal MembershipProviderBase MembershipProvider { get; set; } #region Constructor - public MemberService(IScopeProvider provider, ILogger logger, IEventMessagesFactory eventMessagesFactory, IMemberGroupService memberGroupService, IMediaFileSystem mediaFileSystem, + public MemberService(IScopeProvider provider, ILogger logger, IEventMessagesFactory eventMessagesFactory, IMemberGroupService memberGroupService, IMemberRepository memberRepository, IMemberTypeRepository memberTypeRepository, IMemberGroupRepository memberGroupRepository, IAuditRepository auditRepository) : base(provider, logger, eventMessagesFactory) { @@ -44,7 +43,6 @@ namespace Umbraco.Core.Services.Implement _memberGroupRepository = memberGroupRepository; _auditRepository = auditRepository; _memberGroupService = memberGroupService ?? throw new ArgumentNullException(nameof(memberGroupService)); - _mediaFileSystem = mediaFileSystem ?? throw new ArgumentNullException(nameof(mediaFileSystem)); } #endregion diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 51187a49b7..ea6c003943 100755 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -737,7 +737,6 @@ - @@ -891,7 +890,6 @@ - @@ -916,7 +914,6 @@ - @@ -938,24 +935,15 @@ - - - - - - - - - diff --git a/src/Umbraco.Tests/TestHelpers/TestObjects.cs b/src/Umbraco.Tests/TestHelpers/TestObjects.cs index 22858c2aed..2db17a5312 100644 --- a/src/Umbraco.Tests/TestHelpers/TestObjects.cs +++ b/src/Umbraco.Tests/TestHelpers/TestObjects.cs @@ -157,7 +157,7 @@ namespace Umbraco.Tests.TestHelpers var notificationService = GetLazyService(factory, c => new NotificationService(scopeProvider, userService.Value, contentService.Value, localizationService.Value, logger, GetRepo(c), globalSettings, umbracoSettings.Content)); var serverRegistrationService = GetLazyService(factory, c => new ServerRegistrationService(scopeProvider, logger, eventMessagesFactory, GetRepo(c))); var memberGroupService = GetLazyService(factory, c => new MemberGroupService(scopeProvider, logger, eventMessagesFactory, GetRepo(c))); - var memberService = GetLazyService(factory, c => new MemberService(scopeProvider, logger, eventMessagesFactory, memberGroupService.Value, mediaFileSystem, GetRepo(c), GetRepo(c), GetRepo(c), GetRepo(c))); + var memberService = GetLazyService(factory, c => new MemberService(scopeProvider, logger, eventMessagesFactory, memberGroupService.Value, GetRepo(c), GetRepo(c), GetRepo(c), GetRepo(c))); var mediaService = GetLazyService(factory, c => new MediaService(scopeProvider, mediaFileSystem, logger, eventMessagesFactory, GetRepo(c), GetRepo(c), GetRepo(c), GetRepo(c))); var contentTypeService = GetLazyService(factory, c => new ContentTypeService(scopeProvider, logger, eventMessagesFactory, contentService.Value, GetRepo(c), GetRepo(c), GetRepo(c), GetRepo(c))); var mediaTypeService = GetLazyService(factory, c => new MediaTypeService(scopeProvider, logger, eventMessagesFactory, mediaService.Value, GetRepo(c), GetRepo(c), GetRepo(c), GetRepo(c)));