HeartBeat request is not properly url encoded

[NewAgeCZ]

Hi all,

Describe the bug
I am migrating an application that uses Jersey 1 to RestTemplate.
During migration I have encountered heart beat requests returning 400 Bad request status code and upon further debugging found out, that the sent request is not complete.
The application uses instanceId in format of service#version and that is the problem.

Using spring-cloud-netflix-eureka-client 3.1.2 I tested this scenario with both Jersey 1 and 2 passing.

Sample
I forked the repo and modified testcase AbstractEurekaHttpClientTest adding some characters that have to be escaped into instanceId.

testSendHeartBeat now failed for RestTemplate with 400 status code (as expected), however WebClient test still passed with 200 although logs showed 400 returned as well (no idea why, I did not proceed down the rabbit hole).

I replaced String concatenation in both WebClient and RestTemplate with UriBuilder and UriComponentsBuilder where deemed appropriate.

Feel free to check it out: https://github.com/NewAgeCZ/spring-cloud-netflix/commits/fix/urlencoding

Best regards!

[spencergibb]

PRs welcome

[ZIRAKrezovic]

Hi @spencergibb. PR has been available for some time now #4163

I am happy to jump in and assist if @NewAgeCZ does not have time at present.

[NewAgeCZ]

Hi @ZIRAKrezovic,
I have been waiting for the PR review to come... almost forgot about this fix. If the code changes are approved, I can handle rebasing onto lastest upstream.

Lets wait for the review and I will notice you afterwards if my time schedule would not allow me to react in reasonable time.