Allow null values for healthcheck (Netflix#1402)

krutsko · web-flow · commit dc65995e4786 · 2021-06-11T09:46:57.000-07:00
diff --git a/eureka-client/src/main/java/com/netflix/appinfo/InstanceInfo.java b/eureka-client/src/main/java/com/netflix/appinfo/InstanceInfo.java
@@ -669,15 +669,15 @@ public Builder setHealthCheckUrls(String relativeUrl,
             if (explicitUrl != null) {
                 result.healthCheckUrl = explicitUrl.replace(
                         hostNameInterpolationExpression, result.hostName);
-            } else if (result.isUnsecurePortEnabled) {
+            } else if (result.isUnsecurePortEnabled && relativeUrl != null) {
                 result.healthCheckUrl = HTTP_PROTOCOL + result.hostName + COLON
                         + result.port + relativeUrl;
             }
 
             if (secureExplicitUrl != null) {
                 result.secureHealthCheckUrl = secureExplicitUrl.replace(
                         hostNameInterpolationExpression, result.hostName);
-            } else if (result.isSecurePortEnabled) {
+            } else if (result.isSecurePortEnabled && relativeUrl != null) {
                 result.secureHealthCheckUrl = HTTPS_PROTOCOL + result.hostName
                         + COLON + result.securePort + relativeUrl;
             }
diff --git a/eureka-client/src/test/java/com/netflix/appinfo/InstanceInfoTest.java b/eureka-client/src/test/java/com/netflix/appinfo/InstanceInfoTest.java
@@ -106,6 +106,26 @@ public void testHealthCheckSetContainsValidUrlEntries() throws Exception {
         assertThat(instanceInfo.getHealthCheckUrls().size(), is(equalTo(2)));
     }
 
+    @Test
+    public void testNullUrlEntries() throws Exception {
+        Builder builder = newBuilder()
+                .setAppName("test")
+                .setNamespace("eureka.")
+                .setHostName("localhost")
+                .setPort(80)
+                .setSecurePort(443)
+                .setHealthCheckUrls(null, null, null)
+                .setStatusPageUrl(null, null)
+                .setHomePageUrl(null, null)
+                .enablePort(PortType.SECURE, true);
+
+        // No URLs for healthcheck , status , homepage
+        InstanceInfo noHealtcheckInstanceInfo = builder.build();
+        assertThat(noHealtcheckInstanceInfo.getHealthCheckUrls().size(), is(equalTo(0)));
+        assertThat(noHealtcheckInstanceInfo.getStatusPageUrl(), nullValue());
+        assertThat(noHealtcheckInstanceInfo.getHomePageUrl(), nullValue());
+    }
+
     @Test
     public void testGetIdWithInstanceIdUsed() {
         InstanceInfo baseline = InstanceInfoGenerator.takeOne();
