Merge branch 'main' into runtimeconfig-json-fix-publish

danFbach · web-flow · commit 7a751170df68 · 2025-01-15T07:55:51.000-06:00
diff --git a/src/Meilisearch/Extensions/ObjectExtensions.cs b/src/Meilisearch/Extensions/ObjectExtensions.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Reflection;
 
@@ -43,31 +42,25 @@ internal static string ToQueryString(this object source, BindingFlags bindingAtt
 
                     if (value != null)
                     {
-                        var type = value.GetType();
-
-                        if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(List<>))
+                        if (value is List<string> stringValue)
+                        {
+                            values.Add(key + "=" + string.Join(",", stringValue));
+                        }
+                        else if (value is List<int> intValue)
+                        {
+                            values.Add(key + "=" + string.Join(",", intValue));
+                        }
+                        else if (value is List<TaskInfoStatus> taskInfoStatusValue)
+                        {
+                            values.Add(key + "=" + string.Join(",", taskInfoStatusValue.Select(x => x.ToString())));
+                        }
+                        else if (value is List<TaskInfoType> taskInfoTypeValue)
                         {
-                            var itemType = type.GetGenericArguments()[0];
-                            if (itemType == typeof(string))
-                            {
-                                values.Add(key + "=" + string.Join(",", (List<string>)value));
-                            }
-                            else if (itemType == typeof(int))
-                            {
-                                values.Add(key + "=" + string.Join(",", (List<int>)value));
-                            }
-                            else if (itemType == typeof(TaskInfoStatus))
-                            {
-                                values.Add(key + "=" + string.Join(",", ((List<TaskInfoStatus>)value).Select(x => x.ToString())));
-                            }
-                            else if (itemType == typeof(TaskInfoType))
-                            {
-                                values.Add(key + "=" + string.Join(",", ((List<TaskInfoType>)value).Select(x => x.ToString())));
-                            }
+                            values.Add(key + "=" + string.Join(",", taskInfoTypeValue.Select(x => x.ToString())));
                         }
-                        else if (value is DateTime)
+                        else if (value is DateTime datetimeValue)
                         {
-                            values.Add(key + "=" + Uri.EscapeDataString(((DateTime)value).ToString("yyyy-MM-dd'T'HH:mm:ss.fffzzz")));
+                            values.Add(key + "=" + Uri.EscapeDataString(datetimeValue.ToString("yyyy-MM-dd'T'HH:mm:ss.fffzzz")));
                         }
                         else
                         {
diff --git a/tests/Meilisearch.Tests/DocumentTests.cs b/tests/Meilisearch.Tests/DocumentTests.cs
@@ -162,7 +162,7 @@ public async Task BasicDocumentAdditionFromCsvStringInBatches()
 
             var csvDocuments = await File.ReadAllTextAsync(Datasets.SongsCsvPath);
             var tasks = (await index.AddDocumentsCsvInBatchesAsync(csvDocuments, 250)).ToList();
-            Assert.Equal(2, tasks.Count());
+            Assert.Equal(2, tasks.Count);
             foreach (var u in tasks)
             {
                 u.TaskUid.Should().BeGreaterOrEqualTo(0);
@@ -190,7 +190,7 @@ public async Task BasicDocumentAdditionFromCsvWithDelimiterInBatches()
 
             var csvDocuments = await File.ReadAllTextAsync(Datasets.SongsCsvCustomDelimiterPath);
             var tasks = (await index.AddDocumentsCsvInBatchesAsync(csvDocuments, 15, csvDelimiter: ';')).ToList();
-            Assert.Equal(2, tasks.Count());
+            Assert.Equal(2, tasks.Count);
             foreach (var u in tasks)
             {
                 u.TaskUid.Should().BeGreaterOrEqualTo(0);
@@ -218,7 +218,7 @@ public async Task BasicDocumentAdditionFromNdjsonStringInBatches()
 
             var ndjsonDocuments = await File.ReadAllTextAsync(Datasets.SongsNdjsonPath);
             var tasks = (await index.AddDocumentsNdjsonInBatchesAsync(ndjsonDocuments, 150)).ToList();
-            Assert.Equal(2, tasks.Count());
+            Assert.Equal(2, tasks.Count);
             foreach (var u in tasks)
             {
                 u.TaskUid.Should().BeGreaterOrEqualTo(0);
@@ -469,7 +469,7 @@ public async Task BasicDocumentUpdateFromCsvStringInBatches()
 
             var csvDocuments = await File.ReadAllTextAsync(Datasets.SongsCsvPath);
             var tasks = (await index.UpdateDocumentsCsvInBatchesAsync(csvDocuments, 250)).ToList();
-            Assert.Equal(2, tasks.Count());
+            Assert.Equal(2, tasks.Count);
             foreach (var u in tasks)
             {
                 u.TaskUid.Should().BeGreaterOrEqualTo(0);
@@ -505,7 +505,7 @@ public async Task BasicDocumentUpdateFromNdjsonStringInBatches()
 
             var ndjsonDocuments = await File.ReadAllTextAsync(Datasets.SongsNdjsonPath);
             var tasks = (await index.UpdateDocumentsNdjsonInBatchesAsync(ndjsonDocuments, 150)).ToList();
-            Assert.Equal(2, tasks.Count());
+            Assert.Equal(2, tasks.Count);
             foreach (var u in tasks)
             {
                 u.TaskUid.Should().BeGreaterOrEqualTo(0);
diff --git a/tests/Meilisearch.Tests/IndexSwapTest.cs b/tests/Meilisearch.Tests/IndexSwapTest.cs
@@ -1,9 +1,5 @@
-using System;
 using System.Collections.Generic;
 using System.Text.Json;
-using System.Text.Json.Serialization;
-
-using Microsoft.AspNetCore.WebUtilities;
 
 using Xunit;
 
diff --git a/tests/Meilisearch.Tests/Movie.cs b/tests/Meilisearch.Tests/Movie.cs
@@ -46,7 +46,7 @@ public class FormattedMovie
 
         public string Genre { get; set; }
 
-#pragma warning disable SA1300
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Naming convention used to match meilisearch.")]
         public Movie _Formatted { get; set; }
     }
 
@@ -57,6 +57,8 @@ public class MovieWithRankingScore
         public string Name { get; set; }
 
         public string Genre { get; set; }
+
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Naming convention used to match meilisearch.")]
         public double? _RankingScore { get; set; }
     }
 
@@ -67,6 +69,8 @@ public class MovieWithRankingScoreDetails
         public string Name { get; set; }
 
         public string Genre { get; set; }
+
+        [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Naming convention used to match meilisearch.")]
         public IDictionary<string, JsonElement> _RankingScoreDetails { get; set; }
     }
 }
diff --git a/tests/Meilisearch.Tests/MultiIndexSearchTests.cs b/tests/Meilisearch.Tests/MultiIndexSearchTests.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json;
diff --git a/tests/Meilisearch.Tests/ObjectExtensionsTests.cs b/tests/Meilisearch.Tests/ObjectExtensionsTests.cs
@@ -1,9 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text.Json.Serialization;
 
-using Meilisearch.Converters;
 using Meilisearch.Extensions;
 using Meilisearch.QueryParameters;
 
diff --git a/tests/Meilisearch.Tests/Properties/launchSettings.json b/tests/Meilisearch.Tests/Properties/launchSettings.json
@@ -0,0 +1,12 @@
+{
+  "profiles": {
+    "Meilisearch.Tests": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:52605;http://localhost:52606"
+    }
+  }
+}
diff --git a/tests/Meilisearch.Tests/SearchTests.cs b/tests/Meilisearch.Tests/SearchTests.cs
@@ -213,7 +213,7 @@ public async Task CustomSearchWithFilter()
                 });
             movies.Hits.Should().NotBeEmpty();
             movies.FacetDistribution.Should().BeNull();
-            Assert.Equal(2, movies.Hits.Count());
+            Assert.Equal(2, movies.Hits.Count);
             Assert.Equal("12", movies.Hits.First().Id);
             Assert.Equal("Star Wars", movies.Hits.First().Name);
             Assert.Equal("SF", movies.Hits.First().Genre);
@@ -247,7 +247,7 @@ public async Task CustomSearchWithFilterArray()
                 });
             movies.Hits.Should().NotBeEmpty();
             movies.FacetDistribution.Should().BeNull();
-            Assert.Equal(2, movies.Hits.Count());
+            Assert.Equal(2, movies.Hits.Count);
             Assert.Equal("12", movies.Hits.First().Id);
             Assert.Equal("Star Wars", movies.Hits.First().Name);
             Assert.Equal("SF", movies.Hits.First().Genre);
@@ -265,7 +265,7 @@ public async Task CustomSearchWithFilterMultipleArray()
                 });
             movies.Hits.Should().NotBeEmpty();
             movies.FacetDistribution.Should().BeNull();
-            Assert.Equal(2, movies.Hits.Count());
+            Assert.Equal(2, movies.Hits.Count);
             Assert.Equal("12", movies.Hits.First().Id);
             Assert.Equal("Star Wars", movies.Hits.First().Name);
             Assert.Equal("SF", movies.Hits.First().Genre);
@@ -392,7 +392,7 @@ public async Task CustomSearchWithSort()
                 });
             movies.Hits.Should().NotBeEmpty();
             movies.FacetDistribution.Should().BeNull();
-            Assert.Equal(2, movies.Hits.Count());
+            Assert.Equal(2, movies.Hits.Count);
             Assert.Equal("14", movies.Hits.First().Id);
         }
 
@@ -494,7 +494,7 @@ public async Task CustomSearchWithMatchingStrategyLast()
             var searchQuery = new SearchQuery() { MatchingStrategy = "last" };
             var movies = await _nestedIndex.SearchAsync<MovieWithInfo>("movie about rich", searchQuery);
 
-            Assert.True(movies.Hits.Count() > 1);
+            Assert.True(movies.Hits.Count > 1);
         }
 
         [Fact]
diff --git a/tests/Meilisearch.Tests/ServerConfigs/BaseUriServer.cs b/tests/Meilisearch.Tests/ServerConfigs/BaseUriServer.cs
@@ -13,9 +13,7 @@ public class ConfigFixture : IndexFixture
         {
             public override string MeilisearchAddress()
             {
-                var env = Environment.GetEnvironmentVariable("MEILISEARCH_URL");
-
-                return env == null ? MeilisearchTestAddress : env;
+                return Environment.GetEnvironmentVariable("MEILISEARCH_URL") ?? MeilisearchTestAddress;
             }
         }
 
diff --git a/tests/Meilisearch.Tests/ServerConfigs/ProxiedUriServer.cs b/tests/Meilisearch.Tests/ServerConfigs/ProxiedUriServer.cs
@@ -13,9 +13,7 @@ public class ConfigFixture : IndexFixture
         {
             public override string MeilisearchAddress()
             {
-                var env = Environment.GetEnvironmentVariable("PROXIED_MEILISEARCH");
-
-                return env == null ? MeilisearchTestAddress : env;
+                return Environment.GetEnvironmentVariable("PROXIED_MEILISEARCH") ?? MeilisearchTestAddress;
             }
         }
 
diff --git a/tests/Meilisearch.Tests/SettingsTests.cs b/tests/Meilisearch.Tests/SettingsTests.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
@@ -11,14 +12,12 @@ namespace Meilisearch.Tests
     public abstract class SettingsTests<TFixture> : IAsyncLifetime where TFixture : IndexFixture
     {
         private readonly Settings _defaultSettings;
-        private readonly MeilisearchClient _client;
         private Index _index;
         private readonly TFixture _fixture;
 
         public SettingsTests(TFixture fixture)
         {
             _fixture = fixture;
-            _client = fixture.DefaultClient;
 
             _defaultSettings = new Settings
             {
@@ -34,19 +33,19 @@ public SettingsTests(TFixture fixture)
                 DistinctAttribute = null,
                 SearchableAttributes = new string[] { "*" },
                 DisplayedAttributes = new string[] { "*" },
-                Dictionary = new string[] { },
-                StopWords = new string[] { },
+                Dictionary = Array.Empty<string>(),
+                StopWords = Array.Empty<string>(),
                 SeparatorTokens = new List<string> { },
                 NonSeparatorTokens = new List<string> { },
                 Synonyms = new Dictionary<string, IEnumerable<string>> { },
-                FilterableAttributes = new string[] { },
-                SortableAttributes = new string[] { },
+                FilterableAttributes = Array.Empty<string>(),
+                SortableAttributes = Array.Empty<string>(),
                 ProximityPrecision = "byWord",
                 TypoTolerance = new TypoTolerance
                 {
                     Enabled = true,
-                    DisableOnAttributes = new string[] { },
-                    DisableOnWords = new string[] { },
+                    DisableOnAttributes = Array.Empty<string>(),
+                    DisableOnWords = Array.Empty<string>(),
                     MinWordSizeForTypos = new TypoTolerance.TypoSize
                     {
                         OneTypo = 5,
@@ -437,7 +436,7 @@ public async Task UpdateTypoTolerance()
             var returnedTypoTolerance = new TypoTolerance
             {
                 Enabled = true,
-                DisableOnAttributes = new string[] { },
+                DisableOnAttributes = Array.Empty<string>(),
                 DisableOnWords = new string[] { "harry", "potter" },
                 MinWordSizeForTypos = new TypoTolerance.TypoSize
                 {
@@ -495,7 +494,7 @@ public async Task ResetTypoTolerance()
             var returnedTypoTolerance = new TypoTolerance
             {
                 Enabled = true,
-                DisableOnAttributes = new string[] { },
+                DisableOnAttributes = Array.Empty<string>(),
                 DisableOnWords = new string[] { "harry", "potter" },
                 MinWordSizeForTypos = new TypoTolerance.TypoSize
                 {
@@ -687,13 +686,13 @@ private static Settings SettingsWithDefaultedNullFields(Settings inputSettings,
             };
         }
 
-        private async Task AssertGetEquality<TValue>(IndexGetMethod<TValue> getMethod, TValue expectedValue)
+        private static async Task AssertGetEquality<TValue>(IndexGetMethod<TValue> getMethod, TValue expectedValue)
         {
             var value = await getMethod();
             value.Should().BeEquivalentTo(expectedValue);
         }
 
-        private async Task AssertGetInequality<TValue>(IndexGetMethod<TValue> getMethod, TValue expectedValue)
+        private static async Task AssertGetInequality<TValue>(IndexGetMethod<TValue> getMethod, TValue expectedValue)
         {
             var value = await getMethod();
             value.Should().NotBeEquivalentTo(expectedValue);
diff --git a/tests/Meilisearch.Tests/TaskInfoTests.cs b/tests/Meilisearch.Tests/TaskInfoTests.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public class FormattedMovie`
`46`	`46`
`47`	`47`	`public string Genre { get; set; }`
`48`	`48`
`49`		`-#pragma warning disable SA1300`
	`49`	`+ [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Naming convention used to match meilisearch.")]`
`50`	`50`	`public Movie _Formatted { get; set; }`
`51`	`51`	`}`
`52`	`52`
`@@ -57,6 +57,8 @@ public class MovieWithRankingScore`
`57`	`57`	`public string Name { get; set; }`
`58`	`58`
`59`	`59`	`public string Genre { get; set; }`
	`60`	`+`
	`61`	`+ [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Naming convention used to match meilisearch.")]`
`60`	`62`	`public double? _RankingScore { get; set; }`
`61`	`63`	`}`
`62`	`64`
`@@ -67,6 +69,8 @@ public class MovieWithRankingScoreDetails`
`67`	`69`	`public string Name { get; set; }`
`68`	`70`
`69`	`71`	`public string Genre { get; set; }`
	`72`	`+`
	`73`	`+ [System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Naming convention used to match meilisearch.")]`
`70`	`74`	`public IDictionary<string, JsonElement> _RankingScoreDetails { get; set; }`
`71`	`75`	`}`
`72`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-using System;`
`2`	`1`	`using System.Collections.Generic;`
`3`	`2`	`using System.Linq;`
`4`	`3`	`using System.Text.Json;`
Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,7 @@ public class ConfigFixture : IndexFixture`
`13`	`13`	`{`
`14`	`14`	`public override string MeilisearchAddress()`
`15`	`15`	`{`
`16`		`- var env = Environment.GetEnvironmentVariable("MEILISEARCH_URL");`
`17`		`-`
`18`		`- return env == null ? MeilisearchTestAddress : env;`
	`16`	`+ return Environment.GetEnvironmentVariable("MEILISEARCH_URL") ?? MeilisearchTestAddress;`
`19`	`17`	`}`
`20`	`18`	`}`
`21`	`19`