From 60b346b5a0544cb22932109704c714e02e900124 Mon Sep 17 00:00:00 2001
From: Tobias Kamenicky <TobiasK@kentico.com>
Date: Tue, 12 Nov 2019 14:32:32 +0100
Subject: [PATCH] DEL-2330 Rename method to clarify its purpose

---
 .../QueryParameters/ContentTypeExtractorTests.cs       | 10 +++++-----
 Kentico.Kontent.Delivery/DeliveryClient.cs             |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Kentico.Kontent.Delivery.Tests/QueryParameters/ContentTypeExtractorTests.cs b/Kentico.Kontent.Delivery.Tests/QueryParameters/ContentTypeExtractorTests.cs
index b7514b2b..6e41f916 100644
--- a/Kentico.Kontent.Delivery.Tests/QueryParameters/ContentTypeExtractorTests.cs
+++ b/Kentico.Kontent.Delivery.Tests/QueryParameters/ContentTypeExtractorTests.cs
@@ -49,7 +49,7 @@ public void ExtractParameters_WhenGivenTypeWithCodenameAndExistingParams_AddsCod
         {
             var existingParams = new List<IQueryParameter>() { new SkipParameter(15) };
 
-            var enhancedParams = new List<IQueryParameter>(_client.ExtractParameters<TypeWithContentTypeCodename>(existingParams));
+            var enhancedParams = new List<IQueryParameter>(_client.EnsureContentTypeFilter<TypeWithContentTypeCodename>(existingParams));
 
             Assert.Equal(2, enhancedParams.Count);
             Assert.True(enhancedParams.Find(x => x.GetQueryStringParameter() == $"system.type={CONTENT_TYPE_CODENAME}") != null);
@@ -58,7 +58,7 @@ public void ExtractParameters_WhenGivenTypeWithCodenameAndExistingParams_AddsCod
         [Fact]
         public void ExtractParameters_WhenGivenTypeWithCodename_CreatesNewParams()
         {
-            var enhancedParams = new List<IQueryParameter>(_client.ExtractParameters<TypeWithContentTypeCodename>());
+            var enhancedParams = new List<IQueryParameter>(_client.EnsureContentTypeFilter<TypeWithContentTypeCodename>());
 
             Assert.Single(enhancedParams);
             Assert.True(enhancedParams.Find(x => x.GetQueryStringParameter() == $"system.type={CONTENT_TYPE_CODENAME}") != null);
@@ -67,7 +67,7 @@ public void ExtractParameters_WhenGivenTypeWithCodename_CreatesNewParams()
         [Fact]
         public void ExtractParameters_WhenGivenTypeWithoutCodenameNoParams_CreatesEmptyParams()
         {
-            var enhancedParams = new List<IQueryParameter>(_client.ExtractParameters<TypeWithoutContentTypeCodename>());
+            var enhancedParams = new List<IQueryParameter>(_client.EnsureContentTypeFilter<TypeWithoutContentTypeCodename>());
 
             Assert.Empty(enhancedParams);
         }
@@ -77,7 +77,7 @@ public void ExtractParameters_WhenGivenTypeWithoutCodenameAndParams_ReturnsParam
         {
             var existingParams = new List<IQueryParameter>() { new SkipParameter(15) };
 
-            var enhancedParams = new List<IQueryParameter>(_client.ExtractParameters<TypeWithoutContentTypeCodename>(existingParams));
+            var enhancedParams = new List<IQueryParameter>(_client.EnsureContentTypeFilter<TypeWithoutContentTypeCodename>(existingParams));
 
             Assert.Single(enhancedParams);
             Assert.True(enhancedParams.Find(x => x.GetQueryStringParameter() == $"system.type=TypeWithoutContentTypeCodename") == null);
@@ -88,7 +88,7 @@ public void ExtractParameters_WhenGivenTypeWithCodenameAndExistingTypeParameter_
         {
             var existingParams = new List<IQueryParameter>() { new EqualsFilter("system.type", CONTENT_TYPE_CODENAME) };
 
-            var enhancedParams = new List<IQueryParameter>(_client.ExtractParameters<TypeWithContentTypeCodename>(existingParams));
+            var enhancedParams = new List<IQueryParameter>(_client.EnsureContentTypeFilter<TypeWithContentTypeCodename>(existingParams));
 
             Assert.Single(enhancedParams);
             Assert.True(enhancedParams.Find(x => x.GetQueryStringParameter() == $"system.type={CONTENT_TYPE_CODENAME}") != null);
diff --git a/Kentico.Kontent.Delivery/DeliveryClient.cs b/Kentico.Kontent.Delivery/DeliveryClient.cs
index a195f2d6..d588781c 100644
--- a/Kentico.Kontent.Delivery/DeliveryClient.cs
+++ b/Kentico.Kontent.Delivery/DeliveryClient.cs
@@ -207,7 +207,7 @@ public async Task<DeliveryItemListingResponse<T>> GetItemsAsync<T>(params IQuery
         /// <returns>The <see cref="DeliveryItemListingResponse{T}"/> instance that contains the content items. If no query parameters are specified, all content items are returned.</returns>
         public async Task<DeliveryItemListingResponse<T>> GetItemsAsync<T>(IEnumerable<IQueryParameter> parameters)
         {
-            var enhancedParameters = ExtractParameters<T>(parameters).ToList();
+            var enhancedParameters = EnsureContentTypeFilter<T>(parameters).ToList();
             var endpointUrl = UrlBuilder.GetItemsUrl(enhancedParameters);
             var response = await GetDeliverResponseAsync(endpointUrl);
 
@@ -261,7 +261,7 @@ public IDeliveryItemsFeed<T> GetItemsFeed<T>(params IQueryParameter[] parameters
         /// <returns>The <see cref="DeliveryItemsFeed{T}"/> instance that can be used to enumerate through content items. If no query parameters are specified, all content items are enumerated.</returns>
         public IDeliveryItemsFeed<T> GetItemsFeed<T>(IEnumerable<IQueryParameter> parameters)
         {
-            var enhancedParameters = ExtractParameters<T>(parameters).ToList();
+            var enhancedParameters = EnsureContentTypeFilter<T>(parameters).ToList();
             ValidateItemsFeedParameters(enhancedParameters);
             var endpointUrl = UrlBuilder.GetItemsFeedUrl(enhancedParameters);
             return new DeliveryItemsFeed<T>(GetItemsBatchAsync);
@@ -555,7 +555,7 @@ private bool HasStaleContent(HttpResponseMessage httpResponseMessage)
             return httpResponseMessage.Headers.TryGetValues("X-Stale-Content", out var values) && values.Contains("1", StringComparer.Ordinal);
         }
 
-        internal IEnumerable<IQueryParameter> ExtractParameters<T>(IEnumerable<IQueryParameter> parameters = null)
+        internal IEnumerable<IQueryParameter> EnsureContentTypeFilter<T>(IEnumerable<IQueryParameter> parameters = null)
         {
             var enhancedParameters = parameters != null
                 ? new List<IQueryParameter>(parameters)