Building of a filter with both "any" and "or" fails on keeping operations priority

[AndreyAndreev]

The ODataUri.BuildUrl() method fails when a filter looks like this: any() and (condition1 or condition2)

Assemblies affected

OData .Net lib 7.6.0.30305

Reproduce steps

The test case to demonstrate the bug:

public void BuildFilterWithOpenPropertyInsideAnyAndTwoOrs()
{
    Uri queryUri = new Uri("People?$filter=MyPaintings%2Fany(p%3Ap%2FOpenProperty) and (ID eq 124) and ((ID eq 125) or (ID eq 126))", UriKind.Relative);
    Uri actualUri = UriBuilder(queryUri, ODataUrlKeyDelimiter.Parentheses, settings);
    Assert.Equal(new Uri("http://gobbledygook/People?$filter=MyPaintings%2Fany(p%3Ap%2FOpenProperty) and ID eq 124 and (ID eq 125 or ID eq 126)"), actualUri);
}

Expected result

The parentheses at the end of the filter shouldn't be removed. The result is expected to be like this:
http://gobbledygook/People?$filter=MyPaintings/any(p:p/OpenProperty) and ID eq 124 and (ID eq 125 or ID eq 126)

Actual result

All the parentheses are removed which ruins the filter breaking operations priorities.

http://gobbledygook/People?$filter=MyPaintings/any(p:p/OpenProperty) and ID eq 124 and ID eq 125 or ID eq 126

[AndreyAndreev]

Did some investigations on that.

The root cause of the issue actually is the return type of the any operator which is a nullable bool. All the other operators seems to have a type non-nullable bool. That's the reason for conversion all the BinaryOperatorNode into ConvertNode. So the filter expression tree has this ConvertNode's on top of the BinaryOpertorNode's. That leads to not adding a priority parens in here:

odata.net/src/Microsoft.OData.Core/Uri/NodeToStringBuilder.cs

Lines 75 to 79 in ce39b81

	var right = this.TranslateNode(node.Right);
	if (node.Right.Kind == QueryNodeKind.BinaryOperator && TranslateBinaryOperatorPriority(((BinaryOperatorNode)node.Right).OperatorKind) < TranslateBinaryOperatorPriority(node.OperatorKind))
	{
	right = String.Concat(ExpressionConstants.SymbolOpenParen, right, ExpressionConstants.SymbolClosedParen);
	}

as the Right.Kind not a BinaryOperator anymore but a Convert.

Hope this helps.

[xuzhg]

Merged, thanks for contribution.