4.x: Fix resolved URI query params (#8566)

[VerKWer]

Description

The ClientRequestBase class did not properly resolve URIs when path- and query parameters were mixed. More specifically, the query parameters were stripped if the URI template was absolute.

The reason for this is that ClientRequestBase.resolveUri first resolves path parameters (creating a URI instance) and then calls ClientRequestBase.resolve against that URI. If the constructed URI is absolute, resolving against it clears query parameters.

Note that there are two ClientRequestBase.resolve methods: one for URIs and one for ClientUris. They behave differently regarding query parameters. The former mimics what URI.resolve does, which returns its argument if it is absolute; in particular, it removes any existing query parameters from the ClientUri if the argument is absolute. The latter method, however, leaves query parameters untouched. I'm not sure this difference is intentional but since these are public methods, their semantics shouldn't be changed. I added tests for this.

Resolves #8566

[oracle-contributor-agreement]

Thank you for your pull request and welcome to our community! To contribute, please sign the Oracle Contributor Agreement (OCA).
The following contributors of this PR have not signed the OCA:

• kay@localhost.localdomain

To sign the OCA, please create an Oracle account and sign the OCA in Oracle's Contributor Agreement Application.

When signing the OCA, please provide your GitHub username. After signing the OCA and getting an OCA approval from Oracle, this PR will be automatically updated.

If you are an Oracle employee, please make sure that you are a member of the main Oracle GitHub organization, and your membership in this organization is public.

[oracle-contributor-agreement]

Thank you for signing the OCA.