From 64bae439bf7c735410bc3c95fe45dfb5e90762e3 Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@vertica.dk>
Date: Tue, 26 Mar 2019 08:44:03 +0100
Subject: [PATCH] Fix stuff from review

---
 src/Umbraco.Web/Security/MembershipHelper.cs | 24 ++++++++++----------
 src/Umbraco.Web/UmbracoHelper.cs             |  6 ++---
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Web/Security/MembershipHelper.cs b/src/Umbraco.Web/Security/MembershipHelper.cs
index c2d80257e1..bbcfc0760e 100644
--- a/src/Umbraco.Web/Security/MembershipHelper.cs
+++ b/src/Umbraco.Web/Security/MembershipHelper.cs
@@ -289,14 +289,14 @@ namespace Umbraco.Web.Security
             return MemberCache.GetByProviderKey(key);
         }
 
-        public virtual IEnumerable<IPublishedContent> GetByProviderKey(IEnumerable<object> keys)
+        public virtual IEnumerable<IPublishedContent> GetByProviderKeys(IEnumerable<object> keys)
         {
-            return keys?.Select(GetByProviderKey).WhereNotNull() ?? new IPublishedContent[0];
+            return keys?.Select(GetByProviderKey).WhereNotNull() ?? Enumerable.Empty<IPublishedContent>();
         }
 
-        public virtual IEnumerable<IPublishedContent> GetByProviderKey(params object[] keys)
+        public virtual IEnumerable<IPublishedContent> GetByProviderKeys(params object[] keys)
         {
-            return keys?.Select(GetByProviderKey).WhereNotNull() ?? new IPublishedContent[0];
+            return keys?.Select(GetByProviderKey).WhereNotNull() ?? Enumerable.Empty<IPublishedContent>();
         }
 
         public virtual IPublishedContent GetById(int memberId)
@@ -304,14 +304,14 @@ namespace Umbraco.Web.Security
             return MemberCache.GetById(memberId);
         }
 
-        public virtual IEnumerable<IPublishedContent> GetById(IEnumerable<int> memberIds)
+        public virtual IEnumerable<IPublishedContent> GetByIds(IEnumerable<int> memberIds)
         {
-            return memberIds?.Select(GetById).WhereNotNull() ?? new IPublishedContent[0];
+            return memberIds?.Select(GetById).WhereNotNull() ?? Enumerable.Empty<IPublishedContent>();
         }
 
-        public virtual IEnumerable<IPublishedContent> GetById(params int[] memberIds)
+        public virtual IEnumerable<IPublishedContent> GetByIds(params int[] memberIds)
         {
-            return memberIds?.Select(GetById).WhereNotNull() ?? new IPublishedContent[0];
+            return memberIds?.Select(GetById).WhereNotNull() ?? Enumerable.Empty<IPublishedContent>();
         }
 
         public virtual IPublishedContent GetById(Guid memberId)
@@ -319,14 +319,14 @@ namespace Umbraco.Web.Security
             return GetByProviderKey(memberId);
         }
 
-        public virtual IEnumerable<IPublishedContent> GetById(IEnumerable<Guid> memberIds)
+        public virtual IEnumerable<IPublishedContent> GetByIds(IEnumerable<Guid> memberIds)
         {
-            return GetByProviderKey(memberIds.OfType<object>());
+            return GetByProviderKeys(memberIds.OfType<object>());
         }
 
-        public virtual IEnumerable<IPublishedContent> GetById(params Guid[] memberIds)
+        public virtual IEnumerable<IPublishedContent> GetByIds(params Guid[] memberIds)
         {
-            return GetByProviderKey(memberIds.OfType<object>());
+            return GetByProviderKeys(memberIds.OfType<object>());
         }
 
         public virtual IPublishedContent GetByUsername(string username)
diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index e9fdfd73e5..80e3b95534 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -291,7 +291,7 @@ namespace Umbraco.Web
 
         public IEnumerable<IPublishedContent> Member(IEnumerable<int> ids)
         {
-            return MembershipHelper.GetById(ids);
+            return MembershipHelper.GetByIds(ids);
         }
 
         public IEnumerable<IPublishedContent> Member(IEnumerable<string> ids)
@@ -301,7 +301,7 @@ namespace Umbraco.Web
 
         public IEnumerable<IPublishedContent> Member(IEnumerable<Guid> ids)
         {
-            return MembershipHelper.GetById(ids);
+            return MembershipHelper.GetByIds(ids);
         }
 
         public IEnumerable<IPublishedContent> Member(IEnumerable<Udi> ids)
@@ -326,7 +326,7 @@ namespace Umbraco.Web
 
         public IEnumerable<IPublishedContent> Member(params Guid[] ids)
         {
-            return MembershipHelper.GetById(ids);
+            return MembershipHelper.GetByIds(ids);
         }
 
         public IEnumerable<IPublishedContent> Member(params Udi[] ids)