From a6179e163683c39fb2636aedb1977049d3302cd6 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Mon, 5 Jun 2023 17:15:40 +0200 Subject: [PATCH] Fix script engine. --- .../Scripting/JintScriptEngine.cs | 5 ++++- .../Contents/Text/AtlasTextIndexFixture.cs | 4 ++-- .../Contents/Text/AzureTextIndexFixture.cs | 6 +++--- .../Contents/Text/ElasticSearchTextIndexFixture.cs | 4 ++-- .../Contents/Text/MongoTextIndexFixture.cs | 4 ++-- .../Contents/Text/OpenSearchTextIndexFixture.cs | 4 ++-- 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs index 991078054..3c7bb188f 100644 --- a/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs +++ b/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs @@ -168,7 +168,10 @@ public sealed class JintScriptEngine : IScriptEngine, IScriptDescriptor { var program = parser.Parse(script); - return engine.Evaluate(program); + lock (engine) + { + return engine.Evaluate(program); + } } catch (ArgumentException ex) { diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/AtlasTextIndexFixture.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/AtlasTextIndexFixture.cs index a1730eddb..9d912e488 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/AtlasTextIndexFixture.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/AtlasTextIndexFixture.cs @@ -24,8 +24,8 @@ public sealed class AtlasTextIndexFixture : IAsyncLifetime { TestUtils.SetupBson(); - var mongoClient = MongoClientFactory.Create(TestConfig.Configuration["atlas:configuration"]); - var mongoDatabase = mongoClient.GetDatabase(TestConfig.Configuration["atlas:database"]); + var mongoClient = MongoClientFactory.Create(TestConfig.Configuration["atlas:configuration"]!); + var mongoDatabase = mongoClient.GetDatabase(TestConfig.Configuration["atlas:database"]!); var options = TestConfig.Configuration.GetSection("atlas").Get()!; diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/AzureTextIndexFixture.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/AzureTextIndexFixture.cs index 8743f91de..1ef21d9cd 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/AzureTextIndexFixture.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/AzureTextIndexFixture.cs @@ -17,9 +17,9 @@ public sealed class AzureTextIndexFixture : IAsyncLifetime public AzureTextIndexFixture() { Index = new AzureTextIndex( - TestConfig.Configuration["azureText:serviceEndpoint"], - TestConfig.Configuration["azureText:apiKey"], - TestConfig.Configuration["azureText:indexName"]); + TestConfig.Configuration["azureText:serviceEndpoint"]!, + TestConfig.Configuration["azureText:apiKey"]!, + TestConfig.Configuration["azureText:indexName"]!); } public Task InitializeAsync() diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/ElasticSearchTextIndexFixture.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/ElasticSearchTextIndexFixture.cs index ed4ce3cec..8570c37f8 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/ElasticSearchTextIndexFixture.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/ElasticSearchTextIndexFixture.cs @@ -18,8 +18,8 @@ public sealed class ElasticSearchTextIndexFixture : IAsyncLifetime public ElasticSearchTextIndexFixture() { Index = new ElasticSearchTextIndex( - new ElasticSearchClient(TestConfig.Configuration["elastic:configuration"]), - TestConfig.Configuration["elastic:indexName"], + new ElasticSearchClient(TestConfig.Configuration["elastic:configuration"]!), + TestConfig.Configuration["elastic:indexName"]!, TestUtils.DefaultSerializer); } diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/MongoTextIndexFixture.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/MongoTextIndexFixture.cs index 93d740214..8ea0db9fd 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/MongoTextIndexFixture.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/MongoTextIndexFixture.cs @@ -20,8 +20,8 @@ public sealed class MongoTextIndexFixture : IAsyncLifetime { TestUtils.SetupBson(); - var mongoClient = MongoClientFactory.Create(TestConfig.Configuration["mongoDb:configuration"]); - var mongoDatabase = mongoClient.GetDatabase(TestConfig.Configuration["mongodb:database"]); + var mongoClient = MongoClientFactory.Create(TestConfig.Configuration["mongoDb:configuration"]!); + var mongoDatabase = mongoClient.GetDatabase(TestConfig.Configuration["mongodb:database"]!); Index = new MongoTextIndex(mongoDatabase); } diff --git a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/OpenSearchTextIndexFixture.cs b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/OpenSearchTextIndexFixture.cs index 732b94799..8100d26fb 100644 --- a/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/OpenSearchTextIndexFixture.cs +++ b/backend/tests/Squidex.Domain.Apps.Entities.Tests/Contents/Text/OpenSearchTextIndexFixture.cs @@ -18,8 +18,8 @@ public sealed class OpenSearchTextIndexFixture : IAsyncLifetime public OpenSearchTextIndexFixture() { Index = new ElasticSearchTextIndex( - new OpenSearchClient(TestConfig.Configuration["elastic:configuration"]), - TestConfig.Configuration["elastic:indexName"], + new OpenSearchClient(TestConfig.Configuration["elastic:configuration"]!), + TestConfig.Configuration["elastic:indexName"]!, TestUtils.DefaultSerializer); }