Skip to content

Preserve existing Examine FieldDefinitionCollection if it already exists #20931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 24, 2025
+104 −4
Merged

Preserve existing Examine FieldDefinitionCollection if it already exists #20931

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0c3593
Preserve existing Examine FieldDefinitionCollection if it already exi…
callumbwhyte Nov 22, 2025
016d082
Fix missing bracket
callumbwhyte Nov 22, 2025
cb3d5c6
Minor tidy/addition of comments; addition of unit tests.
AndyButland Nov 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/Umbraco.Examine.Lucene/DependencyInjection/ConfigureIndexOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,20 @@ public void Configure(string? name, LuceneDirectoryIndexOptions options)
case Constants.UmbracoIndexes.InternalIndexName:
options.Analyzer = new CultureInvariantWhitespaceAnalyzer();
options.Validator = _umbracoIndexConfig.GetContentValueSetValidator();
options.FieldDefinitions = new UmbracoFieldDefinitionCollection();
// NOTE: we don't want to overwrite any already registered field definitions
options.FieldDefinitions = new UmbracoFieldDefinitionCollection(options.FieldDefinitions);
break;
case Constants.UmbracoIndexes.ExternalIndexName:
options.Analyzer = new StandardAnalyzer(LuceneInfo.CurrentVersion);
options.Validator = _umbracoIndexConfig.GetPublishedContentValueSetValidator();
options.FieldDefinitions = new UmbracoFieldDefinitionCollection();
// NOTE: we don't want to overwrite any already registered field definitions
options.FieldDefinitions = new UmbracoFieldDefinitionCollection(options.FieldDefinitions);
break;
case Constants.UmbracoIndexes.MembersIndexName:
options.Analyzer = new CultureInvariantWhitespaceAnalyzer();
options.Validator = _umbracoIndexConfig.GetMemberValueSetValidator();
options.FieldDefinitions = new UmbracoFieldDefinitionCollection();
// NOTE: we don't want to overwrite any already registered field definitions
options.FieldDefinitions = new UmbracoFieldDefinitionCollection(options.FieldDefinitions;
break;
case Constants.UmbracoIndexes.DeliveryApiContentIndexName:
options.Analyzer = new StandardAnalyzer(LuceneInfo.CurrentVersion);
Expand Down
9 changes: 9 additions & 0 deletions src/Umbraco.Infrastructure/Examine/UmbracoFieldDefinitionCollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,15 @@ public UmbracoFieldDefinitionCollection()
{
}

public UmbracoFieldDefinitionCollection(FieldDefinitionCollection definitions)
: base(UmbracoIndexFieldDefinitions)
{
foreach (var definition in definitions)
{
AddOrUpdate(definition);
}
}

/// <summary>
/// Overridden to dynamically add field definitions for culture variations
/// </summary>
Expand Down
Loading