Skip to content

[9.3] Fix Query operators to reflect nullable parameters (#8836) #8842

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
flobernd merged 1 commit into from
Mar 5, 2026
Merged

[9.3] Fix Query operators to reflect nullable parameters (#8836) #8842

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 8 additions & 8 deletions src/Elastic.Clients.Elasticsearch/_Shared/Types/QueryDsl/Query.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,48 +14,48 @@ public partial class Query

public static bool operator true(Query _) => false;

public static Query operator &(Query leftContainer, Query rightContainer) =>
public static Query operator &(Query? leftContainer, Query? rightContainer) =>
And(leftContainer, rightContainer);

internal static Query And(Query leftContainer, Query rightContainer)
internal static Query And(Query? leftContainer, Query? rightContainer)
{
if (leftContainer is null && rightContainer is null)
{
throw new ArgumentException("Queries to combine should not both be null.");
}

if (rightContainer is null)
return leftContainer;
return leftContainer!;

if (leftContainer is null)
return rightContainer;

return leftContainer.CombineAsMust(rightContainer);
}

public static Query operator |(Query leftContainer, Query rightContainer) => Or(leftContainer, rightContainer);
public static Query operator |(Query? leftContainer, Query? rightContainer) => Or(leftContainer, rightContainer);

internal static Query Or(Query leftContainer, Query rightContainer)
internal static Query Or(Query? leftContainer, Query? rightContainer)
{
if (leftContainer is null && rightContainer is null)
{
throw new ArgumentException("Queries to combine should not both be null.");
}

if (rightContainer is null)
return leftContainer;
return leftContainer!;

if (leftContainer is null)
return rightContainer;

return leftContainer.CombineAsShould(rightContainer);
}

public static Query operator !(Query queryContainer) => queryContainer is null
public static Query? operator !(Query? queryContainer) => queryContainer is null
? null
: new() { Bool = new() { MustNot = [queryContainer] } };

public static Query operator +(Query queryContainer) => queryContainer is null
public static Query? operator +(Query? queryContainer) => queryContainer is null
? null
: new() { Bool = new() { Filter = [queryContainer] } };
}
Expand Down
Loading