From ac9f021b92a90123e220a08d86eb2eea9765282b Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Thu, 19 Sep 2019 16:42:37 -0400 Subject: [PATCH] Fix RestTemplateEurekaHttpClient status update endpoint. Fixes #3571 (#3657) --- .../cloud/netflix/eureka/EurekaClientAutoConfiguration.java | 4 ++-- .../netflix/eureka/http/RestTemplateEurekaHttpClient.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java index 0e4cbdb47..fb8ec7c07 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java @@ -144,8 +144,8 @@ public class EurekaClientAutoConfiguration { .parseBoolean(getProperty("eureka.instance.secure-port-enabled")); String serverContextPath = env.getProperty("server.servlet.context-path", "/"); - int serverPort = Integer - .parseInt(env.getProperty("server.port", env.getProperty("port", "8080"))); + int serverPort = Integer.parseInt( + env.getProperty("server.port", env.getProperty("port", "8080"))); Integer managementPort = env.getProperty("management.server.port", Integer.class); String managementContextPath = env diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/RestTemplateEurekaHttpClient.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/RestTemplateEurekaHttpClient.java index 68d9b9f74..cc0e98c63 100644 --- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/RestTemplateEurekaHttpClient.java +++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/http/RestTemplateEurekaHttpClient.java @@ -113,7 +113,7 @@ public class RestTemplateEurekaHttpClient implements EurekaHttpClient { @Override public EurekaHttpResponse statusUpdate(String appName, String id, InstanceStatus newStatus, InstanceInfo info) { - String urlPath = serviceUrl + "apps/" + appName + '/' + id + "?status=" + String urlPath = serviceUrl + "apps/" + appName + '/' + id + "/status?value=" + newStatus.name() + "&lastDirtyTimestamp=" + info.getLastDirtyTimestamp().toString();