WebClientEurekaHttpClient - Encode special characters; fixes spring-cloudgh-4121

Author: NewAgeCZ

spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/WebClientEurekaHttpClient.java

@@ -17,6 +17,7 @@
 package org.springframework.cloud.netflix.eureka.http;
 
 import java.util.Map;
+import java.util.Optional;
 
 import com.netflix.appinfo.InstanceInfo;
 import com.netflix.appinfo.InstanceInfo.InstanceStatus;
@@ -53,28 +54,28 @@ public WebClientEurekaHttpClient(WebClient webClient) {
 
 	@Override
 	public EurekaHttpResponse<Void> register(InstanceInfo info) {
-		return webClient.post().uri("apps/" + info.getAppName()).body(BodyInserters.fromValue(info))
-				.header(HttpHeaders.ACCEPT_ENCODING, "gzip")
+		return webClient.post().uri(uriBuilder -> uriBuilder.path("apps/{appName}").build(info.getAppName()))
+				.body(BodyInserters.fromValue(info)).header(HttpHeaders.ACCEPT_ENCODING, "gzip")
 				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE).retrieve()
 				.onStatus(HttpStatusCode::isError, this::ignoreError).toBodilessEntity().map(this::eurekaHttpResponse)
 				.block();
 	}
 
 	@Override
 	public EurekaHttpResponse<Void> cancel(String appName, String id) {
-		return webClient.delete().uri("apps/" + appName + '/' + id).retrieve()
-				.onStatus(HttpStatusCode::isError, this::ignoreError).toBodilessEntity().map(this::eurekaHttpResponse)
-				.block();
+		return webClient.delete().uri(uriBuilder -> uriBuilder.path("apps/{appName}/{id}").build(appName, id))
+				.retrieve().onStatus(HttpStatusCode::isError, this::ignoreError).toBodilessEntity()
+				.map(this::eurekaHttpResponse).block();
 	}
 
 	@Override
 	public EurekaHttpResponse<InstanceInfo> sendHeartBeat(String appName, String id, InstanceInfo info,
 			InstanceStatus overriddenStatus) {
-		String urlPath = "apps/" + appName + '/' + id + "?status=" + info.getStatus().toString()
-				+ "&lastDirtyTimestamp=" + info.getLastDirtyTimestamp().toString()
-				+ (overriddenStatus != null ? "&overriddenstatus=" + overriddenStatus.name() : "");
 
-		ResponseEntity<InstanceInfo> response = webClient.put().uri(urlPath)
+		ResponseEntity<InstanceInfo> response = webClient.put()
+				.uri(uriBuilder -> uriBuilder.path("apps/{appName}/{id}")
+						.queryParam("status", info.getStatus().toString())
+						.queryParam("lastDirtyTimestamp", info.getLastDirtyTimestamp().toString()).build(appName, id))
 				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
 				.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).retrieve()
 				.onStatus(HttpStatusCode::isError, this::ignoreError).toEntity(InstanceInfo.class).block();
@@ -95,22 +96,22 @@ public EurekaHttpResponse<InstanceInfo> sendHeartBeat(String appName, String id,
 	@Override
 	public EurekaHttpResponse<Void> statusUpdate(String appName, String id, InstanceStatus newStatus,
 			InstanceInfo info) {
-		String urlPath = "apps/" + appName + '/' + id + "/status?value=" + newStatus.name() + "&lastDirtyTimestamp="
-				+ info.getLastDirtyTimestamp().toString();
-
-		return webClient.put().uri(urlPath).header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
-				.retrieve().onStatus(HttpStatusCode::isError, this::ignoreError).toBodilessEntity()
-				.map(this::eurekaHttpResponse).block();
+		return webClient.put()
+				.uri(uriBuilder -> uriBuilder.path("apps/{appName}/{id}/status").queryParam("value", newStatus.name())
+						.queryParam("lastDirtyTimestamp", info.getLastDirtyTimestamp().toString()).build(appName, id))
+				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE).retrieve()
+				.onStatus(HttpStatusCode::isError, this::ignoreError).toBodilessEntity().map(this::eurekaHttpResponse)
+				.block();
 	}
 
 	@Override
 	public EurekaHttpResponse<Void> deleteStatusOverride(String appName, String id, InstanceInfo info) {
-		String urlPath = "apps/" + appName + '/' + id + "/status?lastDirtyTimestamp="
-				+ info.getLastDirtyTimestamp().toString();
-
-		return webClient.delete().uri(urlPath).header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
-				.retrieve().onStatus(HttpStatusCode::isError, this::ignoreError).toBodilessEntity()
-				.map(this::eurekaHttpResponse).block();
+		return webClient.delete()
+				.uri(uriBuilder -> uriBuilder.path("apps/{appName}/{id}/status")
+						.queryParam("lastDirtyTimestamp", info.getLastDirtyTimestamp().toString()).build(appName, id))
+				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE).retrieve()
+				.onStatus(HttpStatusCode::isError, this::ignoreError).toBodilessEntity().map(this::eurekaHttpResponse)
+				.block();
 	}
 
 	@Override
@@ -119,13 +120,11 @@ public EurekaHttpResponse<Applications> getApplications(String... regions) {
 	}
 
 	private EurekaHttpResponse<Applications> getApplicationsInternal(String urlPath, String[] regions) {
-		String url = urlPath;
-
-		if (regions != null && regions.length > 0) {
-			url = url + (urlPath.contains("?") ? "&" : "?") + "regions=" + StringUtil.join(regions);
-		}
+		Optional<String> regionsParam = (regions != null && regions.length > 0) ? Optional.of(StringUtil.join(regions))
+				: Optional.empty();
 
-		ResponseEntity<Applications> response = webClient.get().uri(url)
+		ResponseEntity<Applications> response = webClient.get()
+				.uri(uriBuilder -> uriBuilder.path(urlPath).queryParamIfPresent("regions", regionsParam).build())
 				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
 				.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).retrieve()
 				.onStatus(HttpStatusCode::isError, this::ignoreError).toEntity(Applications.class).block();
@@ -156,7 +155,9 @@ public EurekaHttpResponse<Applications> getSecureVip(String secureVipAddress, St
 	@Override
 	public EurekaHttpResponse<Application> getApplication(String appName) {
 
-		ResponseEntity<Application> response = webClient.get().uri("apps/" + appName)
+		ResponseEntity<Application> response = webClient.get()
+				.uri(uriBuilder -> uriBuilder.path("apps/{appName}")
+						.build(appName))
 				.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).retrieve()
 				.onStatus(HttpStatusCode::isError, this::ignoreError).toEntity(Application.class).block();
 
@@ -170,16 +171,17 @@ public EurekaHttpResponse<Application> getApplication(String appName) {
 
 	@Override
 	public EurekaHttpResponse<InstanceInfo> getInstance(String appName, String id) {
-		return getInstanceInternal("apps/" + appName + '/' + id);
+		return getInstanceInternal("apps", appName, id);
 	}
 
 	@Override
 	public EurekaHttpResponse<InstanceInfo> getInstance(String id) {
-		return getInstanceInternal("instances/" + id);
+		return getInstanceInternal("instances", id);
 	}
 
-	private EurekaHttpResponse<InstanceInfo> getInstanceInternal(String urlPath) {
-		ResponseEntity<InstanceInfo> response = webClient.get().uri(urlPath)
+	private EurekaHttpResponse<InstanceInfo> getInstanceInternal(String... pathSegments) {
+		ResponseEntity<InstanceInfo> response = webClient.get()
+				.uri(uriBuilder -> uriBuilder.pathSegment(pathSegments).build())
 				.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).retrieve()
 				.onStatus(HttpStatusCode::isError, this::ignoreError).toEntity(InstanceInfo.class).block();