From 0b3a72d0100fe2f669d2b5bcfc2b582b4573e3e5 Mon Sep 17 00:00:00 2001 From: Martijn Laarman Date: Tue, 2 Jun 2026 11:54:26 +0200 Subject: [PATCH] Update to stable version of internal site search contracts --- Directory.Packages.props | 14 +++++++------- .../Elasticsearch/ElasticsearchMarkdownExporter.cs | 5 +++-- .../Search/SearchBootstrapFixture.cs | 3 ++- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 2eaa799b0..6c65ceb71 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -40,7 +40,7 @@ - + @@ -51,11 +51,11 @@ - - + + - + @@ -80,7 +80,7 @@ - + @@ -96,7 +96,7 @@ - + @@ -122,7 +122,7 @@ - + diff --git a/src/Elastic.Markdown/Exporters/Elasticsearch/ElasticsearchMarkdownExporter.cs b/src/Elastic.Markdown/Exporters/Elasticsearch/ElasticsearchMarkdownExporter.cs index 241fc022c..8ca5b99b9 100644 --- a/src/Elastic.Markdown/Exporters/Elasticsearch/ElasticsearchMarkdownExporter.cs +++ b/src/Elastic.Markdown/Exporters/Elasticsearch/ElasticsearchMarkdownExporter.cs @@ -15,6 +15,7 @@ using Elastic.Ingest.Elasticsearch.Enrichment; using Elastic.Ingest.Elasticsearch.Indices; using Elastic.Internal.Search; +using Elastic.Internal.Search.Mapping; using Elastic.Mapping; using Elastic.Transport; using Microsoft.Extensions.Logging; @@ -94,7 +95,7 @@ IDocumentationConfigurationContext context _lexicalTypeContext = DocumentationMappingContext.DocumentationDocument .CreateContext(type: _buildType, env: endpoints.Environment) with { - ConfigureAnalysis = a => DocumentationAnalysisFactory.BuildAnalysis(a, synonymSetName, indexTimeSynonyms), + ConfigureAnalysis = a => SharedAnalysisFactory.BuildAnalysis(a, synonymSetName, indexTimeSynonyms), IndexSettings = new Dictionary { ["index.default_pipeline"] = _contentDateEnrichment.PipelineName @@ -104,7 +105,7 @@ IDocumentationConfigurationContext context _semanticTypeContext = DocumentationMappingContext.DocumentationDocumentSemantic .CreateContext(type: _buildType, env: endpoints.Environment) with { - ConfigureAnalysis = a => DocumentationAnalysisFactory.BuildAnalysis(a, synonymSetName, indexTimeSynonyms), + ConfigureAnalysis = a => SharedAnalysisFactory.BuildAnalysis(a, synonymSetName, indexTimeSynonyms), IndexSettings = new Dictionary { ["index.final_pipeline"] = _contentDateEnrichment.PipelineName diff --git a/tests-integration/Elastic.Documentation.IntegrationTests/Search/SearchBootstrapFixture.cs b/tests-integration/Elastic.Documentation.IntegrationTests/Search/SearchBootstrapFixture.cs index d98da2c71..8a0ed9702 100644 --- a/tests-integration/Elastic.Documentation.IntegrationTests/Search/SearchBootstrapFixture.cs +++ b/tests-integration/Elastic.Documentation.IntegrationTests/Search/SearchBootstrapFixture.cs @@ -13,6 +13,7 @@ using Elastic.Ingest.Elasticsearch; using Elastic.Ingest.Elasticsearch.Indices; using Elastic.Internal.Search; +using Elastic.Internal.Search.Mapping; using Elastic.Mapping; using Elastic.Markdown.Exporters.Elasticsearch; using Elastic.Transport; @@ -155,7 +156,7 @@ private async ValueTask IsIndexingNeeded() // Create semantic type context to check channel hash (index namespace is 'dev' for tests) var semanticTypeContext = DocumentationMappingContext.DocumentationDocumentSemantic.CreateContext(type: "assembler") with { - ConfigureAnalysis = a => DocumentationAnalysisFactory.BuildAnalysis(a, "docs-assembler", []) + ConfigureAnalysis = a => SharedAnalysisFactory.BuildAnalysis(a, "docs-assembler", []) }; var options = new IngestChannelOptions(transport, semanticTypeContext);