From ffaf12c54859cb09a3a05b50502c33b3a0911e5b Mon Sep 17 00:00:00 2001
From: arkadiuszbiel <abi@novicell.co.uk>
Date: Thu, 24 Oct 2019 09:55:41 +0100
Subject: [PATCH] Create Interface for Member and Content Index to use in
 Populators

---
 src/Umbraco.Examine/ContentIndexPopulator.cs | 4 ++--
 src/Umbraco.Examine/IUmbracoContentIndex.cs  | 9 +++++++++
 src/Umbraco.Examine/IUmbracoMemberIndex.cs   | 9 +++++++++
 src/Umbraco.Examine/MemberIndexPopulator.cs  | 2 +-
 src/Umbraco.Examine/Umbraco.Examine.csproj   | 2 ++
 src/Umbraco.Examine/UmbracoContentIndex.cs   | 6 +++---
 src/Umbraco.Examine/UmbracoMemberIndex.cs    | 4 ++--
 7 files changed, 28 insertions(+), 8 deletions(-)
 create mode 100644 src/Umbraco.Examine/IUmbracoContentIndex.cs
 create mode 100644 src/Umbraco.Examine/IUmbracoMemberIndex.cs

diff --git a/src/Umbraco.Examine/ContentIndexPopulator.cs b/src/Umbraco.Examine/ContentIndexPopulator.cs
index dd4176a774..99ff4d7f87 100644
--- a/src/Umbraco.Examine/ContentIndexPopulator.cs
+++ b/src/Umbraco.Examine/ContentIndexPopulator.cs
@@ -15,7 +15,7 @@ namespace Umbraco.Examine
     /// <summary>
     /// Performs the data lookups required to rebuild a content index
     /// </summary>
-    public class ContentIndexPopulator : IndexPopulator<UmbracoContentIndex>
+    public class ContentIndexPopulator : IndexPopulator<IUmbracoContentIndex>
     {
         private readonly IContentService _contentService;
         private readonly IValueSetBuilder<IContent> _contentValueSetBuilder;
@@ -36,7 +36,7 @@ namespace Umbraco.Examine
         /// <param name="contentValueSetBuilder"></param>
         public ContentIndexPopulator(IContentService contentService, ISqlContext sqlContext, IContentValueSetBuilder contentValueSetBuilder)
             : this(false, null, contentService, sqlContext, contentValueSetBuilder)
-        {   
+        {
         }
 
         /// <summary>
diff --git a/src/Umbraco.Examine/IUmbracoContentIndex.cs b/src/Umbraco.Examine/IUmbracoContentIndex.cs
new file mode 100644
index 0000000000..3181ff663e
--- /dev/null
+++ b/src/Umbraco.Examine/IUmbracoContentIndex.cs
@@ -0,0 +1,9 @@
+using Examine;
+
+namespace Umbraco.Examine
+{
+    public interface IUmbracoContentIndex : IIndex
+    {
+
+    }
+}
diff --git a/src/Umbraco.Examine/IUmbracoMemberIndex.cs b/src/Umbraco.Examine/IUmbracoMemberIndex.cs
new file mode 100644
index 0000000000..b1f325b2e9
--- /dev/null
+++ b/src/Umbraco.Examine/IUmbracoMemberIndex.cs
@@ -0,0 +1,9 @@
+using Examine;
+
+namespace Umbraco.Examine
+{
+    public interface IUmbracoMemberIndex : IIndex
+    {
+
+    }
+}
diff --git a/src/Umbraco.Examine/MemberIndexPopulator.cs b/src/Umbraco.Examine/MemberIndexPopulator.cs
index e20dab91ca..26a3b0aedd 100644
--- a/src/Umbraco.Examine/MemberIndexPopulator.cs
+++ b/src/Umbraco.Examine/MemberIndexPopulator.cs
@@ -7,7 +7,7 @@ using Umbraco.Core.Services;
 
 namespace Umbraco.Examine
 {
-    public class MemberIndexPopulator : IndexPopulator<UmbracoMemberIndex>
+    public class MemberIndexPopulator : IndexPopulator<IUmbracoMemberIndex>
     {
         private readonly IMemberService _memberService;
         private readonly IValueSetBuilder<IMember> _valueSetBuilder;
diff --git a/src/Umbraco.Examine/Umbraco.Examine.csproj b/src/Umbraco.Examine/Umbraco.Examine.csproj
index e30d355dfe..6811fdee20 100644
--- a/src/Umbraco.Examine/Umbraco.Examine.csproj
+++ b/src/Umbraco.Examine/Umbraco.Examine.csproj
@@ -64,10 +64,12 @@
     <Compile Include="ExamineExtensions.cs" />
     <Compile Include="IContentValueSetBuilder.cs" />
     <Compile Include="IContentValueSetValidator.cs" />
+    <Compile Include="IUmbracoContentIndex.cs" />
     <Compile Include="IUmbracoIndexConfig.cs" />
     <Compile Include="IIndexCreator.cs" />
     <Compile Include="IIndexDiagnostics.cs" />
     <Compile Include="IIndexPopulator.cs" />
+    <Compile Include="IUmbracoMemberIndex.cs" />
     <Compile Include="UmbracoIndexConfig.cs" />
     <Compile Include="IndexPopulator.cs" />
     <Compile Include="IndexRebuilder.cs" />
diff --git a/src/Umbraco.Examine/UmbracoContentIndex.cs b/src/Umbraco.Examine/UmbracoContentIndex.cs
index a9e2c72cb6..e266ca789d 100644
--- a/src/Umbraco.Examine/UmbracoContentIndex.cs
+++ b/src/Umbraco.Examine/UmbracoContentIndex.cs
@@ -17,13 +17,13 @@ namespace Umbraco.Examine
     /// <summary>
     /// An indexer for Umbraco content and media
     /// </summary>
-    public class UmbracoContentIndex : UmbracoExamineIndex
+    public class UmbracoContentIndex : UmbracoExamineIndex, IUmbracoContentIndex
     {
         public const string VariesByCultureFieldName = SpecialFieldPrefix + "VariesByCulture";
         protected ILocalizationService LanguageService { get; }
 
         #region Constructors
-        
+
         /// <summary>
         /// Create an index at runtime
         /// </summary>
@@ -141,6 +141,6 @@ namespace Umbraco.Examine
 
             base.PerformDeleteFromIndex(idsAsList, onComplete);
         }
-        
+
     }
 }
diff --git a/src/Umbraco.Examine/UmbracoMemberIndex.cs b/src/Umbraco.Examine/UmbracoMemberIndex.cs
index fbf8a1cc0f..445707ab0c 100644
--- a/src/Umbraco.Examine/UmbracoMemberIndex.cs
+++ b/src/Umbraco.Examine/UmbracoMemberIndex.cs
@@ -11,7 +11,7 @@ namespace Umbraco.Examine
     /// <summary>
     /// Custom indexer for members
     /// </summary>
-    public class UmbracoMemberIndex : UmbracoExamineIndex
+    public class UmbracoMemberIndex : UmbracoExamineIndex, IUmbracoMemberIndex
     {
         /// <summary>
         /// Constructor to allow for creating an indexer at runtime
@@ -32,6 +32,6 @@ namespace Umbraco.Examine
             base(name, luceneDirectory, fieldDefinitions, analyzer, profilingLogger, validator)
         {
         }
-        
+
     }
 }