Remove Obsolete Drivers methods (#17445)

OrchardCMS · Feb 4, 2025 · 1ee293c · 1ee293c
1 parent cc37085
commit 1ee293c
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 106 deletions.
diff --git a/...ardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentFieldDisplayDriver.cs b/...ardCore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentFieldDisplayDriver.cs
@@ -2,7 +2,6 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.DisplayManagement;
 using OrchardCore.DisplayManagement.Handlers;
-using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.DisplayManagement.Views;
 
 namespace OrchardCore.ContentManagement.Display.ContentDisplay;
@@ -235,21 +234,7 @@ public virtual IDisplayResult Edit(TField field, BuildFieldEditorContext context
 
     public virtual Task<IDisplayResult> UpdateAsync(TField field, UpdateFieldEditorContext context)
     {
-#pragma warning disable CS0618 // Type or member is obsolete
-        return UpdateAsync(field, context.Updater, context);
-#pragma warning restore CS0618 // Type or member is obsolete
-    }
-
-    [Obsolete("This method is obsolete and will be removed in version 3. Instead, use the UpdateAsync(TField field, UpdateFieldEditorContext context) method.")]
-    public virtual Task<IDisplayResult> UpdateAsync(TField field, IUpdateModel updater, UpdateFieldEditorContext context)
-    {
-        return Task.FromResult(Update(field, updater, context));
-    }
-
-    [Obsolete("This method is obsolete and will be removed in version 3. Instead, use the UpdateAsync(TField field, UpdateFieldEditorContext context) method.")]
-    public virtual IDisplayResult Update(TField field, IUpdateModel updater, UpdateFieldEditorContext context)
-    {
-        return null;
+        return Task.FromResult<IDisplayResult>(null);
     }
 
     protected string GetEditorShapeType(string shapeType, ContentPartFieldDefinition partFieldDefinition)

diff --git a/...ore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentPartDisplayDriverTPart.cs b/...ore/OrchardCore.ContentManagement.Display/ContentDisplay/ContentPartDisplayDriverTPart.cs
@@ -2,7 +2,6 @@
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.DisplayManagement;
 using OrchardCore.DisplayManagement.Handlers;
-using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.DisplayManagement.Views;
 
 namespace OrchardCore.ContentManagement.Display.ContentDisplay;
@@ -250,14 +249,6 @@ public virtual Task<IDisplayResult> DisplayAsync(TPart part, BuildPartDisplayCon
     }
 
     public virtual IDisplayResult Display(TPart part, BuildPartDisplayContext context)
-    {
-#pragma warning disable CS0618 // Type or member is obsolete
-        return Display(part);
-#pragma warning restore CS0618 // Type or member is obsolete
-    }
-
-    [Obsolete("This method is obsolete and will be removed in version 3. Instead, use the DisplayAsync(TPart part, BuildPartDisplayContext context) or Display(TPart part, BuildPartDisplayContext context) method.")]
-    public virtual IDisplayResult Display(TPart part)
     {
         return null;
     }
@@ -268,27 +259,11 @@ public virtual Task<IDisplayResult> EditAsync(TPart part, BuildPartEditorContext
     }
 
     public virtual IDisplayResult Edit(TPart part, BuildPartEditorContext context)
-    {
-#pragma warning disable CS0618 // Type or member is obsolete
-        return Edit(part);
-#pragma warning restore CS0618 // Type or member is obsolete
-    }
-
-    [Obsolete("This method is obsolete and will be removed in version 3. Instead, use the EditAsync(TPart part, BuildPartEditorContext context) or Edit(TPart part, BuildPartEditorContext context) method.")]
-    public virtual IDisplayResult Edit(TPart part)
     {
         return null;
     }
 
     public virtual Task<IDisplayResult> UpdateAsync(TPart part, UpdatePartEditorContext context)
-    {
-#pragma warning disable CS0618 // Type or member is obsolete
-        return UpdateAsync(part, context.Updater);
-#pragma warning restore CS0618 // Type or member is obsolete
-    }
-
-    [Obsolete("This method is obsolete and will be removed in version 3. Instead, use the UpdateAsync(TPart part, UpdatePartEditorContext context) method.")]
-    public virtual Task<IDisplayResult> UpdateAsync(TPart part, IUpdateModel updater)
     {
         return Task.FromResult<IDisplayResult>(null);
     }

diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Entities/SectionDisplayDriver.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Entities/SectionDisplayDriver.cs
@@ -1,5 +1,4 @@
 using OrchardCore.DisplayManagement.Handlers;
-using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Entities;
 
@@ -20,55 +19,17 @@ public sealed override Task<IDisplayResult> DisplayAsync(TModel model, BuildDisp
         => base.DisplayAsync(model, context);
 
     public override IDisplayResult Display(TModel model, TSection section, BuildDisplayContext context)
-    {
-#pragma warning disable CS0618 // Type or member is obsolete
-        return Display(section, context);
-#pragma warning restore CS0618 // Type or member is obsolete
-    }
-
-    [Obsolete("This method is obsolete and will be removed in version 3. Instead, use the DisplayAsync(TModel model, TSection section, BuildDisplayContext context) ")]
-    public virtual IDisplayResult Display(TSection section, BuildDisplayContext context)
-    {
-        return Display(section);
-    }
-
-    [Obsolete("This method is obsolete and will be removed in version 3. Instead, use the DisplayAsync(TModel model, TSection section, BuildDisplayContext context) ")]
-    public virtual IDisplayResult Display(TSection section)
         => NullShapeResult();
 
     public sealed override Task<IDisplayResult> EditAsync(TModel model, BuildEditorContext context)
         => base.EditAsync(model, context);
 
     public override IDisplayResult Edit(TModel model, TSection section, BuildEditorContext context)
-    {
-#pragma warning disable CS0618 // Type or member is obsolete
-        return Edit(section, context);
-#pragma warning restore CS0618 // Type or member is obsolete
-    }
-
-    [Obsolete("This method is obsolete and will be removed in version 3. Instead, use the EditAsync(TModel model, TSection section, BuildEditorContext context) or Edit(TModel model, TSection section, BuildEditorContext context)")]
-    public virtual IDisplayResult Edit(TSection section, BuildEditorContext context)
-        => Edit(section);
-
-    [Obsolete("This method is obsolete and will be removed in version 3. Instead, use the EditAsync(TModel model, TSection section, BuildEditorContext context) or Edit(TModel model, TSection section, BuildEditorContext context)")]
-    public virtual IDisplayResult Edit(TSection section)
         => NullShapeResult();
 
     public sealed override Task<IDisplayResult> UpdateAsync(TModel model, UpdateEditorContext context)
         => base.UpdateAsync(model, context);
 
     public override Task<IDisplayResult> UpdateAsync(TModel model, TSection section, UpdateEditorContext context)
-    {
-#pragma warning disable CS0618 // Type or member is obsolete
-        return UpdateAsync(section, context);
-#pragma warning restore CS0618 // Type or member is obsolete
-    }
-
-    [Obsolete("This method is obsolete and will be removed in version 3. Instead, use the UpdateAsync(TModel model, TSection section, UpdateEditorContext context)")]
-    public virtual Task<IDisplayResult> UpdateAsync(TSection section, UpdateEditorContext context)
-        => UpdateAsync(section, context.Updater, context.GroupId);
-
-    [Obsolete("This method is obsolete and will be removed in version 3. Instead, use the UpdateAsync(TModel model, TSection section, UpdateEditorContext context)")]
-    public virtual Task<IDisplayResult> UpdateAsync(TSection section, IUpdateModel updater, string groupId)
         => Task.FromResult(NullShapeResult());
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Entities/SiteDisplayDriver.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Entities/SiteDisplayDriver.cs
@@ -56,14 +56,4 @@ protected sealed override void BuildPrefix(ISite model, string htmlFieldPrefix)
 
     protected sealed override string PropertyName
         => base.PropertyName;
-
-#pragma warning disable CS0672 // Member overrides obsolete member
-#pragma warning disable CS0618 // Type or member is obsolete
-    public sealed override IDisplayResult Display(ISite site)
-        => base.Display(site);
-
-    public sealed override IDisplayResult Edit(ISite site)
-        => base.Edit(site);
-#pragma warning restore CS0672 // Member overrides obsolete member
-#pragma warning restore CS0618 // Type or member is obsolete
 }
diff --git a/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/DisplayDriver.cs b/src/OrchardCore/OrchardCore.DisplayManagement/Handlers/DisplayDriver.cs
@@ -58,28 +58,12 @@ public virtual Task<IDisplayResult> DisplayAsync(TModel model, TDisplayContext c
         => Task.FromResult(Display(model, context));
 
     public virtual IDisplayResult Display(TModel model, TDisplayContext context)
-    {
-#pragma warning disable CS0618 // Type or member is obsolete
-        return Display(model);
-#pragma warning restore CS0618 // Type or member is obsolete
-    }
-
-    [Obsolete("This method is obsolete and will be removed in version 3. Instead, use the DisplayAsync(TModel model, TDisplayContext context) or Display(TModel model, TDisplayContext context) method.")]
-    public virtual IDisplayResult Display(TModel model)
         => NullShapeResult();
 
     public virtual Task<IDisplayResult> EditAsync(TModel model, TEditorContext context)
         => Task.FromResult(Edit(model, context));
 
     public virtual IDisplayResult Edit(TModel model, TEditorContext context)
-    {
-#pragma warning disable CS0618 // Type or member is obsolete
-        return Edit(model);
-#pragma warning restore CS0618 // Type or member is obsolete
-    }
-
-    [Obsolete("This method is obsolete and will be removed in version 3. Instead, use the EditAsync(TModel model, TEditorContext context) or Edit(TModel model, TEditorContext context) method.")]
-    public virtual IDisplayResult Edit(TModel model)
         => NullShapeResult();
 
     protected static IDisplayResult NullShapeResult()