From d63492bf413d3d4831b2591b5e5bbd0bc026f14b Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 6 Dec 2018 12:41:38 +1100
Subject: [PATCH] missing nullable parameter in ITagQuery, removes old wrappign
 logic in PublishedContentQuery

---
 src/Umbraco.Web/ITagQuery.cs             |  2 +-
 src/Umbraco.Web/PublishedContentQuery.cs | 73 +++++-------------------
 src/Umbraco.Web/UmbracoHelper.cs         |  8 +--
 3 files changed, 19 insertions(+), 64 deletions(-)

diff --git a/src/Umbraco.Web/ITagQuery.cs b/src/Umbraco.Web/ITagQuery.cs
index 031061ad01..1b96ea330c 100644
--- a/src/Umbraco.Web/ITagQuery.cs
+++ b/src/Umbraco.Web/ITagQuery.cs
@@ -24,7 +24,7 @@ namespace Umbraco.Web
         /// <summary>
         /// Gets all media tagged with any tag in the specified group.
         /// </summary>
-        IEnumerable<IPublishedContent> GetMediaByTagGroup(string group, string culture);
+        IEnumerable<IPublishedContent> GetMediaByTagGroup(string group, string culture = null);
 
         /// <summary>
         /// Gets all tags.
diff --git a/src/Umbraco.Web/PublishedContentQuery.cs b/src/Umbraco.Web/PublishedContentQuery.cs
index 363607fbcb..e0fac5773f 100644
--- a/src/Umbraco.Web/PublishedContentQuery.cs
+++ b/src/Umbraco.Web/PublishedContentQuery.cs
@@ -22,7 +22,6 @@ namespace Umbraco.Web
     /// </summary>
     public class PublishedContentQuery : IPublishedContentQuery
     {
-        private readonly IPublishedContentQuery _query;
         private readonly IPublishedContentCache _contentCache;
         private readonly IPublishedMediaCache _mediaCache;
 
@@ -37,79 +36,52 @@ namespace Umbraco.Web
             _mediaCache = mediaCache ?? throw new ArgumentNullException(nameof(mediaCache));
         }
 
-        /// <summary>
-        /// Constructor used to wrap the ITypedPublishedContentQuery object passed in
-        /// </summary>
-        /// <param name="query"></param>
-        public PublishedContentQuery(IPublishedContentQuery query)
-        {
-            _query = query ?? throw new ArgumentNullException(nameof(query));
-        }
-
         #region Content
 
         public IPublishedContent Content(int id)
         {
-            return _query == null
-                ? ItemById(id, _contentCache)
-                : _query.Content(id);
+            return ItemById(id, _contentCache);
         }
 
         public IPublishedContent Content(Guid id)
         {
-            return _query == null
-                ? ItemById(id, _contentCache)
-                : _query.Content(id);
+            return ItemById(id, _contentCache);
         }
 
         public IPublishedContent Content(Udi id)
         {
             if (!(id is GuidUdi udi)) return null;
-            return _query == null
-                ? ItemById(udi.Guid, _contentCache)
-                : _query.Content(udi.Guid);
+            return ItemById(udi.Guid, _contentCache);
         }
 
         public IPublishedContent ContentSingleAtXPath(string xpath, params XPathVariable[] vars)
         {
-            return _query == null
-                ? ItemByXPath(xpath, vars, _contentCache)
-                : _query.ContentSingleAtXPath(xpath, vars);
+            return ItemByXPath(xpath, vars, _contentCache);
         }
 
         public IEnumerable<IPublishedContent> Content(IEnumerable<int> ids)
         {
-            return _query == null
-                ? ItemsByIds(_contentCache, ids)
-                : _query.Content(ids);
+            return ItemsByIds(_contentCache, ids);
         }
 
         public IEnumerable<IPublishedContent> Content(IEnumerable<Guid> ids)
         {
-            return _query == null
-                ? ItemsByIds(_contentCache, ids)
-                : _query.Content(ids);
+            return ItemsByIds(_contentCache, ids);
         }
 
         public IEnumerable<IPublishedContent> ContentAtXPath(string xpath, params XPathVariable[] vars)
         {
-            return _query == null
-                ? ItemsByXPath(xpath, vars, _contentCache)
-                : _query.ContentAtXPath(xpath, vars);
+            return ItemsByXPath(xpath, vars, _contentCache);
         }
 
         public IEnumerable<IPublishedContent> ContentAtXPath(XPathExpression xpath, params XPathVariable[] vars)
         {
-            return _query == null
-                ? ItemsByXPath(xpath, vars, _contentCache)
-                : _query.ContentAtXPath(xpath, vars);
+            return ItemsByXPath(xpath, vars, _contentCache);
         }
 
         public IEnumerable<IPublishedContent> ContentAtRoot()
         {
-            return _query == null
-                ? ItemsAtRoot(_contentCache)
-                : _query.ContentAtRoot();
+            return ItemsAtRoot(_contentCache);
         }
 
         #endregion
@@ -118,45 +90,33 @@ namespace Umbraco.Web
 
         public IPublishedContent Media(int id)
         {
-            return _query == null
-                ? ItemById(id, _mediaCache)
-                : _query.Media(id);
+            return ItemById(id, _mediaCache);
         }
 
         public IPublishedContent Media(Guid id)
         {
-            return _query == null
-                ? ItemById(id, _mediaCache)
-                : _query.Media(id);
+            return ItemById(id, _mediaCache);
         }
 
         public IPublishedContent Media(Udi id)
         {
             if (!(id is GuidUdi udi)) return null;
-            return _query == null
-                ? ItemById(udi.Guid, _mediaCache)
-                : _query.Media(udi.Guid);
+            return ItemById(udi.Guid, _mediaCache);
         }
 
         public IEnumerable<IPublishedContent> Media(IEnumerable<int> ids)
         {
-            return _query == null
-                ? ItemsByIds(_mediaCache, ids)
-                : _query.Media(ids);
+            return ItemsByIds(_mediaCache, ids);
         }
 
         public IEnumerable<IPublishedContent> Media(IEnumerable<Guid> ids)
         {
-            return _query == null
-                ? ItemsByIds(_mediaCache, ids)
-                : _query.Media(ids);
+            return ItemsByIds(_mediaCache, ids);
         }
 
         public IEnumerable<IPublishedContent> MediaAtRoot()
         {
-            return _query == null
-                ? ItemsAtRoot(_mediaCache)
-                : _query.MediaAtRoot();
+            return ItemsAtRoot(_mediaCache);
         }
 
 
@@ -231,8 +191,6 @@ namespace Umbraco.Web
         {
             //TODO: Can we inject IExamineManager?
 
-            if (_query != null) return _query.Search(skip, take, out totalRecords, term, useWildCards, indexName);
-
             var indexer = string.IsNullOrEmpty(indexName)
                 ? Examine.ExamineManager.Instance.GetIndexer(Constants.Examine.ExternalIndexer)
                 : Examine.ExamineManager.Instance.GetIndexer(indexName);
@@ -261,7 +219,6 @@ namespace Umbraco.Web
         /// <inheritdoc />
         public IEnumerable<PublishedSearchResult> Search(int skip, int take, out int totalRecords, ISearchCriteria criteria, Examine.ISearcher searchProvider = null)
         {
-            if (_query != null) return _query.Search(skip, take, out totalRecords, criteria, searchProvider);
 
             //TODO: Can we inject IExamineManager?
 
diff --git a/src/Umbraco.Web/UmbracoHelper.cs b/src/Umbraco.Web/UmbracoHelper.cs
index 1ce7e51a7f..ea66ec13da 100644
--- a/src/Umbraco.Web/UmbracoHelper.cs
+++ b/src/Umbraco.Web/UmbracoHelper.cs
@@ -33,7 +33,7 @@ namespace Umbraco.Web
         private readonly CacheHelper _appCache;
 
         private IUmbracoComponentRenderer _componentRenderer;
-        private PublishedContentQuery _query;
+        private IPublishedContentQuery _query;
         private MembershipHelper _membershipHelper;
         private ITagQuery _tag;
         private IDataTypeService _dataTypeService;
@@ -133,10 +133,8 @@ namespace Umbraco.Web
         /// <summary>
         /// Gets the query context.
         /// </summary>
-        public PublishedContentQuery ContentQuery => _query ??
-            (_query = _iQuery != null
-                ? new PublishedContentQuery(_iQuery)
-                : new PublishedContentQuery(UmbracoContext.ContentCache, UmbracoContext.MediaCache));
+        public IPublishedContentQuery ContentQuery => _query ??
+            (_query = new PublishedContentQuery(UmbracoContext.ContentCache, UmbracoContext.MediaCache));
 
         /// <summary>
         /// Gets the Umbraco context.