From 0b16c48fc36abd10cf429108939abc046c5149b7 Mon Sep 17 00:00:00 2001
From: Matt Brailsford <me@mattbrailsford.com>
Date: Tue, 5 Nov 2019 11:59:04 +0100
Subject: [PATCH] =?UTF-8?q?Split=20PagedResult=20into=20a=20typed=20and=20?=
 =?UTF-8?q?non-typed=20version=20(Fixes=20#46=E2=80=A6=20(#6871)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Umbraco.Core/Models/PagedResult.cs    |  6 +-----
 src/Umbraco.Core/Models/PagedResultOfT.cs | 20 ++++++++++++++++++++
 src/Umbraco.Core/Umbraco.Core.csproj      |  3 ++-
 3 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 src/Umbraco.Core/Models/PagedResultOfT.cs

diff --git a/src/Umbraco.Core/Models/PagedResult.cs b/src/Umbraco.Core/Models/PagedResult.cs
index ef4d4efdfd..4119751eb3 100644
--- a/src/Umbraco.Core/Models/PagedResult.cs
+++ b/src/Umbraco.Core/Models/PagedResult.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Runtime.Serialization;
 
 namespace Umbraco.Core.Models
@@ -9,7 +8,7 @@ namespace Umbraco.Core.Models
     /// </summary>
     /// <typeparam name="T"></typeparam>
     [DataContract(Name = "pagedCollection", Namespace = "")]
-    public class PagedResult<T>
+    public abstract class PagedResult
     {
         public PagedResult(long totalItems, long pageNumber, long pageSize)
         {
@@ -39,9 +38,6 @@ namespace Umbraco.Core.Models
         [DataMember(Name = "totalItems")]
         public long TotalItems { get; private set; }
 
-        [DataMember(Name = "items")]
-        public IEnumerable<T> Items { get; set; }
-
         /// <summary>
         /// Calculates the skip size based on the paged parameters specified
         /// </summary>
diff --git a/src/Umbraco.Core/Models/PagedResultOfT.cs b/src/Umbraco.Core/Models/PagedResultOfT.cs
new file mode 100644
index 0000000000..efb68863dd
--- /dev/null
+++ b/src/Umbraco.Core/Models/PagedResultOfT.cs
@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+using System.Runtime.Serialization;
+
+namespace Umbraco.Core.Models
+{
+    /// <summary>
+    /// Represents a paged result for a model collection
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    [DataContract(Name = "pagedCollection", Namespace = "")]
+    public class PagedResult<T> : PagedResult
+    {
+        public PagedResult(long totalItems, long pageNumber, long pageSize)
+            : base(totalItems, pageNumber, pageSize)
+        { }
+
+        [DataMember(Name = "items")]
+        public IEnumerable<T> Items { get; set; }
+    }
+}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index ffe20afdb3..d6b63880d6 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -273,6 +273,7 @@
     <Compile Include="Models\Entities\IMediaEntitySlim.cs" />
     <Compile Include="Models\Entities\IMemberEntitySlim.cs" />
     <Compile Include="Models\Entities\MediaEntitySlim.cs" />
+    <Compile Include="Models\PagedResult.cs" />
     <Compile Include="Models\Entities\MemberEntitySlim.cs" />
     <Compile Include="Models\PublishedContent\ILivePublishedModelFactory.cs" />
     <Compile Include="Models\PublishedContent\IPublishedContentType.cs" />
@@ -847,7 +848,7 @@
     <Compile Include="Models\Packaging\InstallationSummary.cs" />
     <Compile Include="Models\Packaging\PackageAction.cs" />
     <Compile Include="Models\Packaging\PreInstallWarnings.cs" />
-    <Compile Include="Models\PagedResult.cs" />
+    <Compile Include="Models\PagedResultOfT.cs" />
     <Compile Include="Models\PartialView.cs" />
     <Compile Include="Models\PartialViewType.cs" />
     <Compile Include="Models\Property.cs" />