#8268: Getting rid of [Obsolete] stuff (Lombiq Technologies: ORCH-308) (#8873)

* Using Orchard.Mvc.FormValueRequiredAttribute instead of the FormValueRequiredAttribute class of the AdminController in the Orchard.Core.Contents namespace.

* Removing obsoleted Spam value from the Orchard.Comments.Models.CommentStatus enum.

* Removing the obsolete AddFilters method of the IFilterProvider interface in the Orchard.Mvc.Filters namespace.

* Removing the obsolete LazyField<T> class from the Orchard.Core.Common.Utilities namespace.

* Removing obsolete methods from OrchardLog4netLogger.

* Removing obsolete Loader(Func<T, T> loader) method from LazyField.cs in the Orchard.ContentManagement.Utilities namespace.

* Removing obsoleted ContentShapeResult ContentShape(IShape shape) method from ContentPartDriver.

* Removing obsoleted ISessionLocator interface.

* Removing obsoleted ContentFieldTemplate methods from ContentFieldDriver<TField>.

* Removing obsoleted IMessagingChannel and IMessageManager interfaces, along with the migration step that updates the existing Send Email activities to use the new Message Queueing functionality.

* Removing obsoleted CustomStepsStep. Don't need the CustomStepsStep RecipeBuilderStep because you can implement IRecipeBuilderStep and IRecipeExecutionStep instead of implementing custom export steps.

* Removing obsoleted CustomPropertiesPart. It used to be necessary for the List feature (also obsolete) to be able to sort on custom data.

* Removing the obsoleted ITaskLeaseService with its default implementation. Removing deprecated Orchard.TaskLease module because it only contains this interface with its default implementation. Use Orchard.Tasks.Locking.IDistributedLockService instead.

* Removing LegacyRulesEvaluator. This condition provider was there for backwards compatibility during the deprecation period.

* Removing IRuleManager with its default implementation. Use Orchard.Conditions.Services.ConditionManager instead.

* Removing unused RequiresOwnership permission.

* Reverting unnecessary sln file changes

* Resolving IMessageChannelSelector instead of IMessageManager in editor templates

* Removing commented out code from ContentPartDriverCoordinatorTests

* Removing Orchard.jQuery too since its quite outdated and Orchard.Resources has been available since 1.9

* Readding the migration step that updates the existing Send Email activities

---------

Co-authored-by: Benedek Farkas <benedek.farkas@lombiq.com>

Author: domonkosgabor

src/Orchard.Tests.Modules/DatabaseEnabledTestsBase.cs

@@ -13,7 +13,6 @@
 using Orchard.Environment.Configuration;
 using Orchard.Services;
 using Orchard.Tests.ContentManagement;
-using Orchard.Tests.Data;
 using Orchard.Tests.Stubs;
 
 namespace Orchard.Tests.Modules
@@ -54,7 +53,6 @@ public virtual void Init()
             var builder = new ContainerBuilder();
             //builder.RegisterModule(new ImplicitCollectionSupportModule());
             builder.RegisterType<InfosetHandler>().As<IContentHandler>();
-            builder.RegisterInstance(new StubLocator(_session)).As<ISessionLocator>();
             builder.RegisterInstance(_clock).As<IClock>();
             builder.RegisterGeneric(typeof(Repository<>)).As(typeof(IRepository<>));
             builder.RegisterInstance(new ShellSettings { Name = ShellSettings.DefaultName, DataProvider = "SqlCe" });
@@ -84,4 +82,4 @@ protected void ClearSession()
             Trace.WriteLine("Flushed and cleared session");
         }
     }
-}
+}

src/Orchard.Tests.Modules/Orchard.Tests.Modules.csproj

@@ -312,10 +312,6 @@
       <Project>{5D0F00F0-26C9-4785-AD61-B85710C60EB0}</Project>
       <Name>Orchard.Tags</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Orchard.Web\Modules\Orchard.TaskLease\Orchard.TaskLease.csproj">
-      <Project>{3f72a4e9-7b72-4260-b010-c16ec54f9baf}</Project>
-      <Name>Orchard.TaskLease</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Orchard.Web\Modules\Orchard.Themes\Orchard.Themes.csproj">
       <Project>{CDE24A24-01D3-403C-84B9-37722E18DFB7}</Project>
       <Name>Orchard.Themes</Name>

src/Orchard.Tests/ContentManagement/Handlers/Coordinators/ContentPartDriverCoordinatorTests.cs

@@ -87,13 +87,9 @@ protected override DriverResult Display(StubPart part, string displayType, dynam
                 var stub = shapeHelper.Stub(Foo: string.Join(",", part.Foo));
                 if (!string.IsNullOrWhiteSpace(displayType))
                     stub.Metadata.Type = string.Format("{0}.{1}", stub.Metadata.Type, displayType);
-                return ContentShape(stub).Location("TopMeta");
-
-                //var viewModel = new StubViewModel { Foo = string.Join(",", part.Foo) };
-                //if (displayType.StartsWith("Summary"))
-                //    return ContentPartTemplate(viewModel, "StubViewModelTerse").Location("TopMeta");
-
-                //return ContentPartTemplate(viewModel).Location("TopMeta");
+                return ContentShape("Parts_Stub", () => {
+                    return string.Empty;
+                }).Location("TopMeta");
             }
 
             protected override DriverResult Editor(StubPart part, dynamic shapeHelper)

src/Orchard.Tests/Data/StubLocator.cs

@@ -12,7 +12,6 @@
 using Orchard.Environment.Configuration;
 using Orchard.Services;
 using Orchard.Tests.ContentManagement;
-using Orchard.Tests.Data;
 using Orchard.Tests.Stubs;
 
 namespace Orchard.Tests
@@ -50,7 +49,6 @@ public virtual void Init()
             var builder = new ContainerBuilder();
             //builder.RegisterModule(new ImplicitCollectionSupportModule());
             builder.RegisterType<InfosetHandler>().As<IContentHandler>();
-            builder.RegisterInstance(new StubLocator(_session)).As<ISessionLocator>();
             builder.RegisterInstance(_clock).As<IClock>();
             builder.RegisterGeneric(typeof(Repository<>)).As(typeof(IRepository<>)).InstancePerLifetimeScope();
             builder.RegisterInstance(_shellSettings = new ShellSettings { Name = ShellSettings.DefaultName, DataProvider = "SqlCe" });
@@ -80,4 +78,4 @@ protected void ClearSession()
             Trace.WriteLine("Flushed and cleared session");
         }
     }
-}
+}

src/Orchard.Tests/DatabaseEnabledTestsBase.cs

@@ -268,7 +268,6 @@
     <Compile Include="Data\RepositoryTests.cs" />
     <Compile Include="Data\ProvidersTests.cs" />
     <Compile Include="Data\Bags\SettingsTests.cs" />
-    <Compile Include="Data\StubLocator.cs" />
     <Compile Include="DisplayManagement\ArgsUtility.cs" />
     <Compile Include="DisplayManagement\CompositeTests.cs" />
     <Compile Include="DisplayManagement\Descriptors\LocationParserTests.cs" />

src/Orchard.Tests/Orchard.Framework.Tests.csproj

@@ -2,59 +2,12 @@
 using System.Collections.Generic;
 using Orchard.ContentManagement;
 using Orchard.Core.Common.Models;
-using Orchard.Core.Containers.Models;
 using Orchard.Core.Title.Models;
 
 namespace Orchard.Core.Containers.Extensions
 {
-    [Obsolete]
     public static class ContentQueryExtensions
     {
-        public static IContentQuery<T> OrderBy<T>(this IContentQuery<T> query, string partAndProperty, bool descendingOrder) where T : IContent
-        {
-            //todo: (heskew) order by custom part properties
-            switch (partAndProperty)
-            {
-                case "ContainablePart.Weight":
-                    query = descendingOrder
-                                ? query.OrderByDescending<ContainablePartRecord>(record => record.Position)
-                                : query.OrderBy<ContainablePartRecord>(record => record.Position);
-                    break;
-                case "TitlePart.Title":
-                    query = descendingOrder
-                                ? query.OrderByDescending<TitlePartRecord>(record => record.Title)
-                                : query.OrderBy<TitlePartRecord>(record => record.Title);
-                    break;
-                case "CustomPropertiesPart.CustomOne":
-                    query = descendingOrder
-                                ? query.OrderByDescending<CustomPropertiesPartRecord>(record => record.CustomOne)
-                                : query.OrderBy<CustomPropertiesPartRecord>(record => record.CustomOne);
-                    break;
-                case "CustomPropertiesPart.CustomTwo":
-                    query = descendingOrder
-                                ? query.OrderByDescending<CustomPropertiesPartRecord>(record => record.CustomTwo)
-                                : query.OrderBy<CustomPropertiesPartRecord>(record => record.CustomTwo);
-                    break;
-                case "CustomPropertiesPart.CustomThree":
-                    query = descendingOrder
-                                ? query.OrderByDescending<CustomPropertiesPartRecord>(record => record.CustomThree)
-                                : query.OrderBy<CustomPropertiesPartRecord>(record => record.CustomThree);
-                    break;
-                case "CommonPart.CreatedUtc":
-                    query = descendingOrder
-                                ? query.OrderByDescending<CommonPartRecord>(record => record.CreatedUtc)
-                                : query.OrderBy<CommonPartRecord>(record => record.CreatedUtc);
-                    break;
-                default: // "CommonPart.PublishedUtc"
-                    query = descendingOrder
-                                ? query.OrderByDescending<CommonPartRecord>(record => record.PublishedUtc)
-                                : query.OrderBy<CommonPartRecord>(record => record.PublishedUtc);
-                    break;
-            }
-
-            return query;
-        }
-
         public static IContentQuery<ContentItem> Where(this IContentQuery<ContentItem> query, string partAndProperty, string comparisonOperator, string comparisonValue)
         {
             var filterKey = string.Format("{0}|{1}", partAndProperty, comparisonOperator);
@@ -74,19 +27,6 @@ public static IContentQuery<ContentItem> Where(this IContentQuery<ContentItem> q
             {"CommonPart.PublishedUtc|>", new Func<IContentQuery<ContentItem>, string, IContentQuery<ContentItem>>((q, s) => q.Where<CommonPartRecord>(r => r.PublishedUtc > DateTime.Parse(s)))},
             {"CommonPart.PublishedUtc|=", new Func<IContentQuery<ContentItem>, string, IContentQuery<ContentItem>>((q, s) => q.Where<CommonPartRecord>(r => r.PublishedUtc == DateTime.Parse(s)))}, // todo: (heskew) not practical as is. needs some sense of precision....
             {"CommonPart.PublishedUtc|^=", new Func<IContentQuery<ContentItem>, string, IContentQuery<ContentItem>>((q, s) => q.Where<CommonPartRecord>(r => true /* can't modified PublishedUtc for partial comparisons */))},
-            // todo: (hesekw) this could benefit from a better filter implementation as this is currently very limited in functionality and I have no idea how the custom parts will be used by folks
-            {"CustomPropertiesPart.CustomOne|<", new Func<IContentQuery<ContentItem>, string, IContentQuery<ContentItem>>((q, s) => q.Where<CustomPropertiesPartRecord>(r => true /* CompareTo is not implemented - r.CustomOne.CompareTo(s) == -1*/))},
-            {"CustomPropertiesPart.CustomOne|>", new Func<IContentQuery<ContentItem>, string, IContentQuery<ContentItem>>((q, s) => q.Where<CustomPropertiesPartRecord>(r => true /* CompareTo is not implemented - r.CustomOne.CompareTo(s) == 1*/))},
-            {"CustomPropertiesPart.CustomOne|=", new Func<IContentQuery<ContentItem>, string, IContentQuery<ContentItem>>((q, s) => q.Where<CustomPropertiesPartRecord>(r => r.CustomOne.Equals(s, StringComparison.OrdinalIgnoreCase)))},
-            {"CustomPropertiesPart.CustomOne|^=", new Func<IContentQuery<ContentItem>, string, IContentQuery<ContentItem>>((q, s) => q.Where<CustomPropertiesPartRecord>(r => r.CustomOne.StartsWith(s, StringComparison.OrdinalIgnoreCase)))},
-            {"CustomPropertiesPart.CustomTwo|<", new Func<IContentQuery<ContentItem>, string, IContentQuery<ContentItem>>((q, s) => q.Where<CustomPropertiesPartRecord>(r => true /* CompareTo is not implemented - r.CustomTwo.CompareTo(s) == -1*/))},
-            {"CustomPropertiesPart.CustomTwo|>", new Func<IContentQuery<ContentItem>, string, IContentQuery<ContentItem>>((q, s) => q.Where<CustomPropertiesPartRecord>(r => true /* CompareTo is not implemented - r.CustomTwo.CompareTo(s) == 1*/))},
-            {"CustomPropertiesPart.CustomTwo|=", new Func<IContentQuery<ContentItem>, string, IContentQuery<ContentItem>>((q, s) => q.Where<CustomPropertiesPartRecord>(r => r.CustomTwo.Equals(s, StringComparison.OrdinalIgnoreCase)))},
-            {"CustomPropertiesPart.CustomTwo|^=", new Func<IContentQuery<ContentItem>, string, IContentQuery<ContentItem>>((q, s) => q.Where<CustomPropertiesPartRecord>(r => r.CustomTwo.StartsWith(s, StringComparison.OrdinalIgnoreCase)))},
-            {"CustomPropertiesPart.CustomThree|<", new Func<IContentQuery<ContentItem>, string, IContentQuery<ContentItem>>((q, s) => q.Where<CustomPropertiesPartRecord>(r => true /* CompareTo is not implemented - r.CustomThree.CompareTo(s) == -1*/))},
-            {"CustomPropertiesPart.CustomThree|>", new Func<IContentQuery<ContentItem>, string, IContentQuery<ContentItem>>((q, s) => q.Where<CustomPropertiesPartRecord>(r => true /* CompareTo is not implemented - r.CustomThree.CompareTo(s) == 1*/))},
-            {"CustomPropertiesPart.CustomThree|=", new Func<IContentQuery<ContentItem>, string, IContentQuery<ContentItem>>((q, s) => q.Where<CustomPropertiesPartRecord>(r => r.CustomThree.Equals(s, StringComparison.OrdinalIgnoreCase)))},
-            {"CustomPropertiesPart.CustomThree|^=", new Func<IContentQuery<ContentItem>, string, IContentQuery<ContentItem>>((q, s) => q.Where<CustomPropertiesPartRecord>(r => r.CustomThree.StartsWith(s, StringComparison.OrdinalIgnoreCase)))},
         };
     }
-}
+}