Align namespaces in Search to Umbraco.Cms.Infrastructure

src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs

@@ -37,12 +37,12 @@ using Umbraco.Cms.Infrastructure.Migrations.Install;
 using Umbraco.Cms.Infrastructure.Migrations.PostMigrations;
 using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Cms.Infrastructure.Runtime;
+using Umbraco.Cms.Infrastructure.Search;
 using Umbraco.Core;
 using Umbraco.Core.Packaging;
 using Umbraco.Core.Serialization;
 using Umbraco.Extensions;
 using Umbraco.Web;
-using Umbraco.Web.Search;
 
 namespace Umbraco.Cms.Infrastructure.DependencyInjection
 {

src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.DistributedCache.cs

@@ -6,9 +6,9 @@ using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.PublishedCache;
 using Umbraco.Cms.Core.Services.Changes;
 using Umbraco.Cms.Core.Sync;
+using Umbraco.Cms.Infrastructure.Search;
 using Umbraco.Core.Sync;
 using Umbraco.Extensions;
-using Umbraco.Web.Search;
 
 namespace Umbraco.Cms.Infrastructure.DependencyInjection
 {

src/Umbraco.Infrastructure/Search/BackgroundIndexRebuilder.cs

@@ -8,9 +8,8 @@ using Microsoft.Extensions.Logging;
 using Umbraco.Cms.Core.Runtime;
 using Umbraco.Cms.Infrastructure.Examine;
 using Umbraco.Cms.Infrastructure.HostedServices;
-using Umbraco.Core;
 
-namespace Umbraco.Web.Search
+namespace Umbraco.Cms.Infrastructure.Search
 {
     /// <summary>
     /// Utility to rebuild all indexes on a background thread

src/Umbraco.Infrastructure/Search/ExamineComponent.cs

@@ -16,8 +16,9 @@ using Umbraco.Cms.Core.Services.Changes;
 using Umbraco.Cms.Core.Sync;
 using Umbraco.Cms.Infrastructure.Examine;
 using Umbraco.Extensions;
+using Umbraco.Web;
 
-namespace Umbraco.Web.Search
+namespace Umbraco.Cms.Infrastructure.Search
 {
     public sealed class ExamineComponent : IComponent
     {

src/Umbraco.Infrastructure/Search/ExamineComposer.cs

@@ -9,7 +9,7 @@ using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Infrastructure.Examine;
 using Umbraco.Extensions;
 
-namespace Umbraco.Web.Search
+namespace Umbraco.Cms.Infrastructure.Search
 {
     /// <summary>
     /// Configures and installs Examine.

src/Umbraco.Infrastructure/Search/ExamineFinalComponent.cs

@@ -1,11 +1,9 @@
 using System;
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.Runtime;
-using Umbraco.Core;
 
-namespace Umbraco.Web.Search
+namespace Umbraco.Cms.Infrastructure.Search
 {
-
     /// <summary>
     /// Executes after all other examine components have executed
     /// </summary>

src/Umbraco.Infrastructure/Search/ExamineFinalComposer.cs

@@ -1,6 +1,6 @@
 using Umbraco.Cms.Core.Composing;
 
-namespace Umbraco.Web.Search
+namespace Umbraco.Cms.Infrastructure.Search
 {
     // examine's final composer composes after all user composers
     // and *also* after ICoreComposer (in case IUserComposer is disabled)

src/Umbraco.Infrastructure/Search/ExamineIndexModel.cs

@@ -1,12 +1,10 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Runtime.Serialization;
-using Examine;
 
-namespace Umbraco.Web.Search
+namespace Umbraco.Cms.Infrastructure.Search
 {
     [DataContract(Name = "indexer", Namespace = "")]
-    public class ExamineIndexModel 
+    public class ExamineIndexModel
     {
         [DataMember(Name = "name")]
         public string Name { get; set; }

src/Umbraco.Infrastructure/Search/ExamineSearcherModel.cs

@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Text;
+using System.Runtime.Serialization;
 
-namespace Umbraco.Web.Search
+namespace Umbraco.Cms.Infrastructure.Search
 {
     [DataContract(Name = "searcher", Namespace = "")]
     public class ExamineSearcherModel

src/Umbraco.Infrastructure/Search/ExamineUserComponent.cs

@@ -1,8 +1,7 @@
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.Runtime;
-using Umbraco.Core;
 
-namespace Umbraco.Web.Search
+namespace Umbraco.Cms.Infrastructure.Search
 {
     /// <summary>
     /// An abstract class for custom index authors to inherit from

src/Umbraco.Infrastructure/Search/UmbracoTreeSearcher.cs

@@ -6,7 +6,6 @@ using Umbraco.Cms.Core.Mapping;
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Cms.Core.Models.Entities;
-using Umbraco.Cms.Core.Models.Mapping;
 using Umbraco.Cms.Core.Routing;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Trees;
@@ -15,7 +14,7 @@ using Umbraco.Cms.Infrastructure.Persistence;
 using Umbraco.Extensions;
 using Constants = Umbraco.Cms.Core.Constants;
 
-namespace Umbraco.Web.Search
+namespace Umbraco.Cms.Infrastructure.Search
 {
 
     /// <summary>

src/Umbraco.Infrastructure/Search/UmbracoTreeSearcherFields.cs

@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Umbraco.Cms.Infrastructure.Examine;
 
-namespace Umbraco.Web.Search
+namespace Umbraco.Cms.Infrastructure.Search
 {
     public class UmbracoTreeSearcherFields : IUmbracoTreeSearcherFields
     {

src/Umbraco.Infrastructure/Suspendable.cs

@@ -2,7 +2,7 @@
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Infrastructure.Examine;
-using Umbraco.Web.Search;
+using Umbraco.Cms.Infrastructure.Search;
 
 namespace Umbraco.Web
 {

src/Umbraco.Tests.Integration/DependencyInjection/UmbracoBuilderExtensions.cs

@@ -20,12 +20,12 @@ using Umbraco.Cms.Core.WebAssets;
 using Umbraco.Cms.Infrastructure.Examine;
 using Umbraco.Cms.Infrastructure.HostedServices;
 using Umbraco.Cms.Infrastructure.PublishedCache;
+using Umbraco.Cms.Infrastructure.Search;
 using Umbraco.Cms.Tests.Common.TestHelpers.Stubs;
 using Umbraco.Cms.Tests.Integration.Implementations;
 using Umbraco.Core.Services.Implement;
 using Umbraco.Examine;
 using Umbraco.Extensions;
-using Umbraco.Web.Search;
 
 namespace Umbraco.Cms.Tests.Integration.DependencyInjection
 {

src/Umbraco.Web.BackOffice/Controllers/EntityController.cs

@@ -19,12 +19,12 @@ using Umbraco.Cms.Core.Strings;
 using Umbraco.Cms.Core.Trees;
 using Umbraco.Cms.Core.Xml;
 using Umbraco.Cms.Infrastructure.Persistence;
+using Umbraco.Cms.Infrastructure.Search;
 using Umbraco.Cms.Web.BackOffice.ModelBinders;
 using Umbraco.Cms.Web.Common.Attributes;
 using Umbraco.Cms.Web.Common.ModelBinders;
 using Umbraco.Extensions;
 using Umbraco.Web;
-using Umbraco.Web.Search;
 using Constants = Umbraco.Cms.Core.Constants;
 
 namespace Umbraco.Cms.Web.BackOffice.Controllers

src/Umbraco.Web.BackOffice/Controllers/ExamineManagementController.cs

@@ -8,10 +8,10 @@ using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.IO;
 using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Cms.Infrastructure.Examine;
+using Umbraco.Cms.Infrastructure.Search;
 using Umbraco.Cms.Web.Common.Attributes;
 using Umbraco.Examine;
 using Umbraco.Extensions;
-using Umbraco.Web.Search;
 using Constants = Umbraco.Cms.Core.Constants;
 using SearchResult = Umbraco.Cms.Core.Models.ContentEditing.SearchResult;
 

src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs

@@ -16,11 +16,11 @@ using Umbraco.Cms.Core.Models.Trees;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Trees;
+using Umbraco.Cms.Infrastructure.Search;
 using Umbraco.Cms.Web.Common.Attributes;
 using Umbraco.Cms.Web.Common.Authorization;
 using Umbraco.Core;
 using Umbraco.Extensions;
-using Umbraco.Web.Search;
 using Constants = Umbraco.Cms.Core.Constants;
 
 namespace Umbraco.Cms.Web.BackOffice.Trees

src/Umbraco.Web.BackOffice/Trees/ContentTypeTreeController.cs

@@ -11,10 +11,10 @@ using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Cms.Core.Models.Trees;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Trees;
+using Umbraco.Cms.Infrastructure.Search;
 using Umbraco.Cms.Web.Common.Attributes;
 using Umbraco.Cms.Web.Common.Authorization;
 using Umbraco.Extensions;
-using Umbraco.Web.Search;
 using Constants = Umbraco.Cms.Core.Constants;
 
 namespace Umbraco.Cms.Web.BackOffice.Trees

src/Umbraco.Web.BackOffice/Trees/DataTypeTreeController.cs

@@ -11,10 +11,10 @@ using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Cms.Core.Models.Trees;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Trees;
+using Umbraco.Cms.Infrastructure.Search;
 using Umbraco.Cms.Web.Common.Attributes;
 using Umbraco.Cms.Web.Common.Authorization;
 using Umbraco.Extensions;
-using Umbraco.Web.Search;
 using Constants = Umbraco.Cms.Core.Constants;
 
 namespace Umbraco.Cms.Web.BackOffice.Trees

src/Umbraco.Web.BackOffice/Trees/MediaTreeController.cs

@@ -14,10 +14,10 @@ using Umbraco.Cms.Core.Models.Trees;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Trees;
+using Umbraco.Cms.Infrastructure.Search;
 using Umbraco.Cms.Web.Common.Attributes;
 using Umbraco.Cms.Web.Common.Authorization;
 using Umbraco.Extensions;
-using Umbraco.Web.Search;
 using Constants = Umbraco.Cms.Core.Constants;
 
 namespace Umbraco.Cms.Web.BackOffice.Trees

src/Umbraco.Web.BackOffice/Trees/MediaTypeTreeController.cs

@@ -11,10 +11,10 @@ using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Cms.Core.Models.Trees;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Trees;
+using Umbraco.Cms.Infrastructure.Search;
 using Umbraco.Cms.Web.Common.Attributes;
 using Umbraco.Cms.Web.Common.Authorization;
 using Umbraco.Extensions;
-using Umbraco.Web.Search;
 using Constants = Umbraco.Cms.Core.Constants;
 
 namespace Umbraco.Cms.Web.BackOffice.Trees

src/Umbraco.Web.BackOffice/Trees/MemberTreeController.cs

@@ -12,11 +12,11 @@ using Umbraco.Cms.Core.Models.Trees;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Trees;
+using Umbraco.Cms.Infrastructure.Search;
 using Umbraco.Cms.Web.Common.Attributes;
 using Umbraco.Cms.Web.Common.Authorization;
 using Umbraco.Cms.Web.Common.ModelBinders;
 using Umbraco.Extensions;
-using Umbraco.Web.Search;
 using Constants = Umbraco.Cms.Core.Constants;
 
 namespace Umbraco.Cms.Web.BackOffice.Trees

src/Umbraco.Web.BackOffice/Trees/MemberTypeTreeController.cs

@@ -8,9 +8,9 @@ using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.ContentEditing;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Trees;
+using Umbraco.Cms.Infrastructure.Search;
 using Umbraco.Cms.Web.Common.Attributes;
 using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Web.Search;
 using Constants = Umbraco.Cms.Core.Constants;
 
 namespace Umbraco.Cms.Web.BackOffice.Trees

src/Umbraco.Web.BackOffice/Trees/TemplatesTreeController.cs

@@ -12,10 +12,10 @@ using Umbraco.Cms.Core.Models.Entities;
 using Umbraco.Cms.Core.Models.Trees;
 using Umbraco.Cms.Core.Services;
 using Umbraco.Cms.Core.Trees;
+using Umbraco.Cms.Infrastructure.Search;
 using Umbraco.Cms.Web.Common.Attributes;
 using Umbraco.Cms.Web.Common.Authorization;
 using Umbraco.Extensions;
-using Umbraco.Web.Search;
 using Constants = Umbraco.Cms.Core.Constants;
 
 namespace Umbraco.Cms.Web.BackOffice.Trees