Merge branch 'main' into openiddict_7.0

Author: MikeAlhayek

src/OrchardCore/OrchardCore.Abstractions/Shell/Builders/Extensions/ServiceCollectionExtensions.cs

@@ -38,27 +38,17 @@ public static IServiceCollection Configure<TOptions>(
     /// Registers an <see cref="IAsyncConfigureOptions{TOptions}"/> used to configure
     /// asynchronously a type of options just after a tenant container is created.
     /// </summary>
-    public static IServiceCollection Configure<TOptions, TConfigure>(this IServiceCollection services, ILogger logger = null)
+    public static IServiceCollection Configure<TOptions, TConfigure>(this IServiceCollection services)
         where TOptions : class, IAsyncOptions, new()
         where TConfigure : IAsyncConfigureOptions<TOptions>
     {
         if (!services.Any(d => d.ServiceType == typeof(TOptions)))
         {
-            if (logger is not null && logger.IsEnabled(LogLevel.Debug))
-            {
-                logger.LogDebug("Adding IAsyncOptions type '{OptionsType}' instance to the service collection.", typeof(TOptions).FullName);
-            }
-
             services.AddSingleton(new TOptions());
         }
 
         if (!services.Any(d => d.ServiceType == typeof(TConfigure)))
         {
-            if (logger is not null && logger.IsEnabled(LogLevel.Debug))
-            {
-                logger.LogDebug("Adding IAsyncConfigureOptions type '{ConfigureType}' instance to the service collection.", typeof(TConfigure).FullName);
-            }
-
             services.AddTransient(typeof(TConfigure));
             services.Initialize(sp =>
             {

src/OrchardCore/OrchardCore.Search.AzureAI.Core/Services/AzureAISearchIndexManager.cs

@@ -35,7 +35,7 @@ public async Task<bool> CreateAsync(IndexProfile indexProfile)
     {
         if (await ExistsAsync(indexProfile.IndexFullName))
         {
-            return true;
+            return false;
         }
 
         try
@@ -73,7 +73,7 @@ public async Task<SearchIndex> GetAsync(string indexFullName)
 
             var response = await client.GetIndexAsync(indexFullName);
 
-            return response?.Value;
+            return response.Value;
         }
         catch (RequestFailedException e)
         {

src/OrchardCore/OrchardCore.Search.Elasticsearch.Core/Services/ElasticsearchIndexManager.cs

@@ -137,11 +137,13 @@ public async Task<bool> CreateAsync(IndexProfile index)
             {
                 _logger.LogWarning("There were issues creating an index in Elasticsearch");
             }
+
+            return false;
         }
 
         await _indexEvents.InvokeAsync((handler, ctx) => handler.CreatedAsync(ctx), context, _logger);
 
-        return response.Acknowledged;
+        return true;
     }
 
     public async Task<string> GetIndexSettingsAsync(string indexFullName)
@@ -162,6 +164,8 @@ public async Task<string> GetIndexSettingsAsync(string indexFullName)
             {
                 _logger.LogWarning("There were issues retrieving index settings from Elasticsearch");
             }
+
+            return null;
         }
 
         var setting = response.Indices[indexFullName].Settings;
@@ -187,6 +191,8 @@ public async Task<string> GetIndexInfoAsync(string indexFullName)
             {
                 _logger.LogWarning("There were issues retrieving index info from Elasticsearch");
             }
+
+            return null;
         }
 
         var info = response.Indices[indexFullName];

src/OrchardCore/OrchardCore.Search.Lucene.Core/LuceneIndexStore.cs

@@ -20,11 +20,10 @@ namespace OrchardCore.Lucene.Core;
 
 public sealed class LuceneIndexStore : ILuceneIndexStore, IDisposable
 {
-    private readonly ConcurrentDictionary<string, IndexReaderPool> _indexPools = new(StringComparer.OrdinalIgnoreCase);
-    private readonly ConcurrentDictionary<string, IndexWriterWrapper> _writers = new(StringComparer.OrdinalIgnoreCase);
-    private readonly ConcurrentDictionary<string, DateTime> _timestamps = new(StringComparer.OrdinalIgnoreCase);
+    private readonly ConcurrentDictionary<string, IndexReaderPool> _indexPools = new();
+    private readonly ConcurrentDictionary<string, IndexWriterWrapper> _writers = new();
+    private readonly ConcurrentDictionary<string, DateTime> _timestamps = new();
 
-    private readonly object _directoryLock = new();
     private readonly object _lock = new();
 
     private readonly string _rootPath;
@@ -77,11 +76,10 @@ public Task<bool> RemoveAsync(IndexProfile index)
 
         lock (_lock)
         {
-            if (_writers.TryRemove(index.Id, out var writer))
+            if (_writers.TryGetValue(index.Id, out var writer))
             {
                 writer.IsClosing = true;
                 writer.Dispose();
-                removed = true;
             }
 
             if (_indexPools.TryRemove(index.Id, out var reader))
@@ -101,6 +99,8 @@ public Task<bool> RemoveAsync(IndexProfile index)
                 }
                 catch { }
             }
+
+            removed = _writers.TryRemove(index.Id, out _);
         }
 
         return Task.FromResult(removed);
@@ -168,7 +168,6 @@ private Task WriteAsync(IndexProfile index, Action<IndexWriter> action, bool clo
                             }
                         }
 
-                        writer.IsClosing = true;
                         writer.Dispose();
 
                         _timestamps.AddOrUpdate(index.Id, _clock.UtcNow, (key, oldValue) => _clock.UtcNow);
@@ -183,11 +182,6 @@ private Task WriteAsync(IndexProfile index, Action<IndexWriter> action, bool clo
 
         if (writer.IsClosing)
         {
-            if (_writers.TryRemove(index.Id, out var removedWriter))
-            {
-                removedWriter.Dispose();
-            }
-
             return Task.CompletedTask;
         }
 
@@ -213,11 +207,15 @@ private IndexReaderPool.IndexReaderLease GetReader(IndexProfile index)
         {
             var path = new DirectoryInfo(GetFullPath(index.IndexFullName));
 
-            var directory = FSDirectory.Open(path);
+            // Lucene is not thread safe on this call.
+            lock (_lock)
+            {
+                var directory = FSDirectory.Open(path);
 
-            var reader = DirectoryReader.Open(directory);
+                var reader = DirectoryReader.Open(directory);
 
-            return new IndexReaderPool(reader);
+                return new IndexReaderPool(reader);
+            }
         });
 
         return pool.Acquire();
@@ -237,11 +235,7 @@ private FSDirectory CreateDirectory(string indexFullName)
                 path.Create();
             }
 
-            // Lucene is not thread safe on this call.
-            lock (_directoryLock)
-            {
-                return FSDirectory.Open(path);
-            }
+            return FSDirectory.Open(path);
         }
     }
 

src/OrchardCore/OrchardCore/Modules/Overrides/HttpClient/ActiveHandlerTrackingEntry.cs

@@ -31,7 +31,7 @@ public ActiveHandlerTrackingEntry(
         Scope = scope;
         Lifetime = lifetime;
 
-        _lock = new object();
+        _lock = new();
     }
 
     public LifetimeTrackingHttpMessageHandler Handler { get; private set; }

test/OrchardCore.Tests/Apis/ContentManagement/DeploymentPlans/ContentStepLuceneQueryTests.cs

@@ -14,6 +14,7 @@ public async Task ShouldUpdateLuceneIndexesOnImport()
 
         // Setup
         await context.InitializeAsync();
+        await context.WaitForOutstandingDeferredTasksAsync(TestContext.Current.CancellationToken);
 
         // Act
         var recipe = BlogPostDeploymentContext.GetContentStepRecipe(context.OriginalBlogPost, jItem =>
@@ -33,10 +34,7 @@ public async Task ShouldUpdateLuceneIndexesOnImport()
         data.Add(secondContentItem);
 
         await context.PostRecipeAsync(recipe);
-
-        // Indexing of the content item happens in the deferred-task and may not be immediate available,
-        // so we wait until the indexing is done before querying.
-        await context.WaitForOutstandingDeferredTasksAsync(TestContext.Current.CancellationToken);
+        await context.WaitForHttpBackgroundJobsAsync(TestContext.Current.CancellationToken);
 
         // Test
         var result = await context